From 611aa423fdf7764ed2696ff6f10d3a2f8bd71769 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 13:33:48 +0300 Subject: [PATCH 01/21] Update computer_session.h --- src/computer_session.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/computer_session.h b/src/computer_session.h index ac12ae5a6e51..4882b0497325 100644 --- a/src/computer_session.h +++ b/src/computer_session.h @@ -101,6 +101,7 @@ class computer_session void action_maps(); void action_miss_disarm(); void action_open(); + void action_open_locker(); void action_open_disarm(); void action_portal(); void action_radio_archive(); From f6f0290c32e4628cce860b9976c8584ae11dbff5 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 14:38:37 +0300 Subject: [PATCH 02/21] Update computer_session.cpp --- src/computer_session.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/computer_session.cpp b/src/computer_session.cpp index 5404cc4d84a0..0b2704e14e23 100644 --- a/src/computer_session.cpp +++ b/src/computer_session.cpp @@ -274,6 +274,7 @@ computer_session::computer_action_functions = { { COMPACT_MAPS, &computer_session::action_maps }, { COMPACT_MISS_DISARM, &computer_session::action_miss_disarm }, { COMPACT_OPEN, &computer_session::action_open }, + { COMPACT_OPEN_LOCKER, &computer_session::action_open_locker }, { COMPACT_OPEN_DISARM, &computer_session::action_open_disarm }, { COMPACT_PORTAL, &computer_session::action_portal }, { COMPACT_RADIO_ARCHIVE, &computer_session::action_radio_archive }, @@ -322,6 +323,11 @@ void computer_session::action_open() get_map().translate_radius( t_door_metal_locked, t_floor, 25.0, g->u.pos(), true ); query_any( _( "Doors opened. Press any key…" ) ); } +void computer_session::action_open_locker() +{ + get_map().translate_radius( f_secure_locker_l, f_secure_locker_o, 25.0, g->u.pos(), true ); + query_any( _( "Lockers opened. Press any key…" ) ); +} //LOCK AND UNLOCK are used to build more complex buildings // that can have multiple doors that can be locked and be From 0ce5c03e7f2f5e118b56c5e3284afe13e8da9d41 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 17:22:26 +0300 Subject: [PATCH 03/21] Update computer_session.cpp --- src/computer_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/computer_session.cpp b/src/computer_session.cpp index 0b2704e14e23..ae784fde0825 100644 --- a/src/computer_session.cpp +++ b/src/computer_session.cpp @@ -325,7 +325,7 @@ void computer_session::action_open() } void computer_session::action_open_locker() { - get_map().translate_radius( f_secure_locker_l, f_secure_locker_o, 25.0, g->u.pos(), true ); + get_map().translate_radius( f_secure_locker_l, f_secure_locker_o, 8.0, g->u.pos(), true ); query_any( _( "Lockers opened. Press any key…" ) ); } From b81a0241d834c7144b8462a58c51b5d03b7fceba Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 18:00:55 +0300 Subject: [PATCH 04/21] Update computer_session.cpp --- src/computer_session.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/computer_session.cpp b/src/computer_session.cpp index ae784fde0825..257e1e582ad4 100644 --- a/src/computer_session.cpp +++ b/src/computer_session.cpp @@ -325,7 +325,7 @@ void computer_session::action_open() } void computer_session::action_open_locker() { - get_map().translate_radius( f_secure_locker_l, f_secure_locker_o, 8.0, g->u.pos(), true ); + get_map().translate_radius( t_secure_locker_l, t_secure_locker_o, 8.0, g->u.pos(), true ); query_any( _( "Lockers opened. Press any key…" ) ); } From 4456e6260fefaa5c1f53d5f3f33af4f033d0d770 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 18:29:56 +0300 Subject: [PATCH 05/21] Update mapdata.cpp --- src/mapdata.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mapdata.cpp b/src/mapdata.cpp index a14042f658ce..2a9510cf50ba 100644 --- a/src/mapdata.cpp +++ b/src/mapdata.cpp @@ -713,6 +713,7 @@ ter_id t_null, t_sewage_pipe, t_sewage_pump, t_centrifuge, t_column, + t_secure_locker_l, t_secure_locker_o, t_vat, t_rootcellar, t_cvdbody, t_cvdmachine, @@ -888,6 +889,8 @@ void set_ter_ids() t_paper = ter_id( "t_paper" ); t_rock_wall = ter_id( "t_rock_wall" ); t_rock_wall_half = ter_id( "t_rock_wall_half" ); + t_secure_locker_l = ter_id( "t_secure_locker_l" ); + t_secure_locker_o = ter_id( "t_secure_locker_o" ); t_tree = ter_id( "t_tree" ); t_tree_young = ter_id( "t_tree_young" ); t_tree_apple = ter_id( "t_tree_apple" ); From 76b0ad93925fe1eab3fda6a49724fd860254c121 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 18:31:38 +0300 Subject: [PATCH 06/21] Update mapdata.h --- src/mapdata.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mapdata.h b/src/mapdata.h index f8bdd50a8e6f..c05774d5df32 100644 --- a/src/mapdata.h +++ b/src/mapdata.h @@ -648,7 +648,7 @@ extern ter_id t_null, // Ground t_dirt, t_sand, t_clay, t_dirtmound, t_pit_shallow, t_pit, t_grave, t_grave_new, t_pit_corpsed, t_pit_covered, t_pit_spiked, t_pit_spiked_covered, t_pit_glass, t_pit_glass_covered, - t_rock_floor, + _floor, t_grass, t_grass_long, t_grass_tall, t_grass_golf, t_grass_dead, t_grass_white, t_moss, t_metal_floor, t_pavement, t_pavement_y, t_sidewalk, t_concrete, @@ -690,9 +690,10 @@ extern ter_id t_null, t_window_boarded_noglass, t_window_bars_alarm, t_window_bars, t_window_stained_green, t_window_stained_red, t_window_stained_blue, t_window_no_curtains, t_window_no_curtains_open, t_window_no_curtains_taped, - t_rock, t_fault, + , t_fault, t_paper, t_rock_wall, t_rock_wall_half, + t_secure_locker_l, t_secure_locker_o, // Tree t_tree, t_tree_young, t_tree_apple, t_tree_apple_harvested, t_tree_coffee, t_tree_coffee_harvested, t_tree_pear, t_tree_pear_harvested, From f79c2b13b1911ed89ec8e76b51119d688e716e56 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 18:45:09 +0300 Subject: [PATCH 07/21] Update mapdata.h --- src/mapdata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mapdata.h b/src/mapdata.h index c05774d5df32..54973fcf5d1a 100644 --- a/src/mapdata.h +++ b/src/mapdata.h @@ -690,7 +690,7 @@ extern ter_id t_null, t_window_boarded_noglass, t_window_bars_alarm, t_window_bars, t_window_stained_green, t_window_stained_red, t_window_stained_blue, t_window_no_curtains, t_window_no_curtains_open, t_window_no_curtains_taped, - , t_fault, + t_fault, t_paper, t_rock_wall, t_rock_wall_half, t_secure_locker_l, t_secure_locker_o, From 7c4de0b5334300d0dd0f997ff33ae20d2982def8 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 19:15:53 +0300 Subject: [PATCH 08/21] Update computer.cpp --- src/computer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/computer.cpp b/src/computer.cpp index 30709df19323..e52f28a78edc 100644 --- a/src/computer.cpp +++ b/src/computer.cpp @@ -313,6 +313,7 @@ std::string enum_to_string( const computer_action act ) case COMPACT_MISS_DISARM: return "miss_disarm"; case COMPACT_OPEN: return "open"; case COMPACT_OPEN_DISARM: return "open_disarm"; + case COMPACT_OPEN_LOCKER: return "open_locker"; case COMPACT_PORTAL: return "portal"; case COMPACT_RADIO_ARCHIVE: return "radio_archive"; case COMPACT_RELEASE: return "release"; From 03b9f6282dea978b854f38f59b96299fb8af11a2 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 19:16:33 +0300 Subject: [PATCH 09/21] Update computer_session.h --- src/computer_session.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/computer_session.h b/src/computer_session.h index 4882b0497325..e2b02ac8d34d 100644 --- a/src/computer_session.h +++ b/src/computer_session.h @@ -101,8 +101,8 @@ class computer_session void action_maps(); void action_miss_disarm(); void action_open(); - void action_open_locker(); void action_open_disarm(); + void action_open_locker(); void action_portal(); void action_radio_archive(); void action_release(); From 3489aebfd902b2ef6f42b7b30402cb627392645b Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 19:17:30 +0300 Subject: [PATCH 10/21] Update computer.h --- src/computer.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/computer.h b/src/computer.h index 109fed3349c8..2fb67eb3bc8a 100644 --- a/src/computer.h +++ b/src/computer.h @@ -37,6 +37,7 @@ enum computer_action { COMPACT_MISS_DISARM, COMPACT_OPEN, COMPACT_OPEN_DISARM, + COMPACT_OPEN_LOCKER, COMPACT_PORTAL, COMPACT_RADIO_ARCHIVE, COMPACT_RELEASE, From 9d4feda0796b1f66c2ab1104d6c40bc4ed7bb51a Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 20:07:47 +0300 Subject: [PATCH 11/21] Update mapdata.h --- src/mapdata.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mapdata.h b/src/mapdata.h index 54973fcf5d1a..5c69e717f4fc 100644 --- a/src/mapdata.h +++ b/src/mapdata.h @@ -660,6 +660,7 @@ extern ter_id t_null, t_slime, t_bridge, t_covered_well, + t_rock_floor, // Lighting related t_utility_light, // Walls @@ -691,6 +692,7 @@ extern ter_id t_null, t_window_stained_green, t_window_stained_red, t_window_stained_blue, t_window_no_curtains, t_window_no_curtains_open, t_window_no_curtains_taped, t_fault, + t_rock, t_paper, t_rock_wall, t_rock_wall_half, t_secure_locker_l, t_secure_locker_o, From dbdf3c42d0c13733e8f3aec8a7d94ae384fd03fe Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Mon, 27 May 2024 21:56:41 +0300 Subject: [PATCH 12/21] Update terrain-manufactured.json --- .../terrain-manufactured.json | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index 162e33e52e35..b0d5bbda728e 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -255,6 +255,92 @@ "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] }, { "item": "scrap", "count": [ 4, 8 ] } ] } }, + { + "type": "terrain", + "id": "t_secure_locker_l", + "name": "locked secure locker", + "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is locked.", + "symbol": "X", + "color": "light_gray", + "looks_like": "f_locker", + "move_cost": 0, + "coverage": 75, + "max_volume": "500 L", + "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "BLOCKSDOOR" ], + "lockpick_result": "t_secure_locker_c", + "lockpick_message": "With a satisfying click, the lock on the secure locker opens.", + "examine_action": "locked_object_pickable", + "oxytorch": { "result": "t_secure_locker_o", "duration": "10 seconds" }, + "bash": { + "ter_set": "t_floor", + "str_min": 40, + "str_max": 100, + "sound": "screeching metal!", + "sound_fail": "clang!", + "items": [ + { "item": "sheet_metal", "count": 3 }, + { "item": "scrap", "count": [ 7, 15 ] }, + { "item": "sheet_metal_small", "count": [ 9, 16 ] }, + { "item": "pipe", "count": [ 2, 5 ] } + ], + "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } +}}, + + { + "type": "terrain", + "id": "t_secure_locker_c", + "name": "closed secure locker", + "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is closed but not locked.", + "symbol": "X", + "color": "light_gray", + "looks_like": "f_locker", + "move_cost": 0, + "coverage": 75, + "max_volume": "500 L", + "open": "t_secure_locker_o", + "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "BLOCKSDOOR" ], + "bash": { + "ter_set": "t_floor", + "str_min": 40, + "str_max": 100, + "sound": "screeching metal!", + "sound_fail": "clang!", + "items": [ + { "item": "sheet_metal", "count": 3 }, + { "item": "scrap", "count": [ 7, 15 ] }, + { "item": "sheet_metal_small", "count": [ 9, 16 ] }, + { "item": "pipe", "count": [ 2, 5 ] } + ], + "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } + }}, + + { + "type": "terrain", + "id": "t_secure_locker_o", + "name": "open secure locker", + "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is open.", + "symbol": "X", + "looks_like": "f_locker", + "color": "light_gray", + "move_cost": 0, + "coverage": 75, + "max_volume": "500 L", + "close": "t_secure_locker_c", + "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "BLOCKSDOOR" ], + "bash": { + "ter_set": "t_floor", + "str_min": 40, + "str_max": 100, + "sound": "screeching metal!", + "sound_fail": "clang!", + "items": [ + { "item": "sheet_metal", "count": 3 }, + { "item": "scrap", "count": [ 7, 15 ] }, + { "item": "sheet_metal_small", "count": [ 9, 16 ] }, + { "item": "pipe", "count": [ 2, 5 ] } + ], + "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } + }}, { "type": "terrain", "id": "t_metal_ventilation_shutter", From de9877d007c8afcbee129e2740f53f0a9e3c295d Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 19:35:41 +0000 Subject: [PATCH 13/21] style(autofix.ci): automated formatting --- .../terrain-manufactured.json | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index b0d5bbda728e..881cedad1276 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -262,7 +262,7 @@ "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is locked.", "symbol": "X", "color": "light_gray", - "looks_like": "f_locker", + "looks_like": "f_locker", "move_cost": 0, "coverage": 75, "max_volume": "500 L", @@ -272,11 +272,11 @@ "examine_action": "locked_object_pickable", "oxytorch": { "result": "t_secure_locker_o", "duration": "10 seconds" }, "bash": { - "ter_set": "t_floor", + "ter_set": "t_floor", "str_min": 40, "str_max": 100, "sound": "screeching metal!", - "sound_fail": "clang!", + "sound_fail": "clang!", "items": [ { "item": "sheet_metal", "count": 3 }, { "item": "scrap", "count": [ 7, 15 ] }, @@ -284,27 +284,27 @@ { "item": "pipe", "count": [ 2, 5 ] } ], "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } -}}, - - { + } + }, + { "type": "terrain", "id": "t_secure_locker_c", "name": "closed secure locker", "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is closed but not locked.", "symbol": "X", "color": "light_gray", - "looks_like": "f_locker", + "looks_like": "f_locker", "move_cost": 0, "coverage": 75, "max_volume": "500 L", - "open": "t_secure_locker_o", + "open": "t_secure_locker_o", "flags": [ "TRANSPARENT", "CONTAINER", "SEALED", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "BLOCKSDOOR" ], "bash": { - "ter_set": "t_floor", + "ter_set": "t_floor", "str_min": 40, "str_max": 100, "sound": "screeching metal!", - "sound_fail": "clang!", + "sound_fail": "clang!", "items": [ { "item": "sheet_metal", "count": 3 }, { "item": "scrap", "count": [ 7, 15 ] }, @@ -312,27 +312,27 @@ { "item": "pipe", "count": [ 2, 5 ] } ], "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } - }}, - - { + } + }, + { "type": "terrain", "id": "t_secure_locker_o", "name": "open secure locker", "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is open.", "symbol": "X", - "looks_like": "f_locker", + "looks_like": "f_locker", "color": "light_gray", "move_cost": 0, "coverage": 75, "max_volume": "500 L", - "close": "t_secure_locker_c", + "close": "t_secure_locker_c", "flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "MINEABLE", "BLOCKSDOOR" ], "bash": { - "ter_set": "t_floor", + "ter_set": "t_floor", "str_min": 40, "str_max": 100, "sound": "screeching metal!", - "sound_fail": "clang!", + "sound_fail": "clang!", "items": [ { "item": "sheet_metal", "count": 3 }, { "item": "scrap", "count": [ 7, 15 ] }, @@ -340,7 +340,8 @@ { "item": "pipe", "count": [ 2, 5 ] } ], "ranged": { "reduction": [ 20, 40 ], "destroy_threshold": 100, "block_unaimed_chance": "75%" } - }}, + } + }, { "type": "terrain", "id": "t_metal_ventilation_shutter", From 23f54e02ae58f68dc223706ba818ee86e4766fe2 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:09:19 +0300 Subject: [PATCH 14/21] Update seed.json --- data/json/items/comestibles/seed.json | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index ce8c1378c40e..259fefe76b34 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -800,5 +800,39 @@ "grow": "14 days", "required_terrain_flag": "SHALLOW_WATER" } + }, + { + "type": "COMESTIBLE", + "comestible_type": "FOOD", + "name": { + "str_sp": "mushroom culture" + }, + "category": "seeds", + "volume": "250 ml", + "weight": "100 g", + "price": "200 cent", + "price_postapoc": "25 cent", + "charges": 1, + "stack_size": 100, + "material": "veggy", + "primary_material": "mushroom", + "symbol": ".", + "color": "light_gray", + "flags": [ + "NUTRIENT_OVERRIDE", + "PLANTABLE_SEED", + "UNSAFE_CONSUME" + ], + "id": "mushroom_culture", + "copy-from": "seed", + "description": "A wet plant chunk, suitable for growing your own mushrooms. You need to \"plant\" it on logs or racks to grow though.", + "seed_data": { + "plant_name": "mushroom", + "fruit": "mushroom", + "fruit_div": 2, + "seeds":false, + "required_terrain_flag": "MUSHROOM_PLANTABLE", + "grow": "28 days" } +} ] From 3413ae6ed814be35d5204821cef2e5eb9b79d1b0 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:10:13 +0300 Subject: [PATCH 15/21] Update mushroom.json --- data/json/items/comestibles/mushroom.json | 56 +++++++++++++++-------- 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/data/json/items/comestibles/mushroom.json b/data/json/items/comestibles/mushroom.json index 0935f474fb7f..8150ed85605a 100644 --- a/data/json/items/comestibles/mushroom.json +++ b/data/json/items/comestibles/mushroom.json @@ -82,24 +82,40 @@ "fun": 1 }, { - "type": "COMESTIBLE", - "id": "mushroom", - "name": "mushroom", - "weight": "69 g", - "color": "brown", - "spoils_in": "2 days", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": 1, - "calories": 15, - "description": "Mushrooms are tasty, but be careful. Some can poison you, while others are hallucinogenic.", - "price": "140 cent", - "price_postapoc": "50 cent", - "material": "mushroom", - "volume": "250 ml", - "fun": -3, - "flags": [ "SMOKABLE", "FORAGE_POISON", "FORAGE_HALLU", "RAW" ], - "smoking_result": "dry_mushroom", - "vitamins": [ [ "vitC", 2 ], [ "iron", 2 ] ] - } + "type": "COMESTIBLE", + "id": "mushroom", + "name": "mushroom", + "weight": "70 g", + "color": "brown", + "spoils_in": "7 days", + "comestible_type": "FOOD", + "symbol": "%", + "healthy": 1, + "charges":10, + "calories": 15, + "description": "Mushrooms are tasty, but be careful. Some can poison you, while others are hallucinogenic.", + "price": "140 cent", + "price_postapoc": "50 cent", + "material": "mushroom", + "volume": "250 ml", + "fun": -3, + "flags": [ + "SMOKABLE", + "FORAGE_POISON", + "FORAGE_HALLU", + "RAW" + ], + "smoking_result": "dry_mushroom", + "//":"if we ever implement macro nutritients, mushrooms should be a good protein source.", + "vitamins": [ + [ + "vitC", + 2 + ], + [ + "iron", + 2 + ] + ] +} ] From f78957e4a50a2e62dcc985ac47217fae30475a3e Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 08:10:56 +0000 Subject: [PATCH 16/21] style(autofix.ci): automated formatting --- data/json/items/comestibles/mushroom.json | 58 +++++++++-------------- data/json/items/comestibles/seed.json | 58 ++++++++++------------- 2 files changed, 48 insertions(+), 68 deletions(-) diff --git a/data/json/items/comestibles/mushroom.json b/data/json/items/comestibles/mushroom.json index 8150ed85605a..64a119a90dbf 100644 --- a/data/json/items/comestibles/mushroom.json +++ b/data/json/items/comestibles/mushroom.json @@ -82,40 +82,26 @@ "fun": 1 }, { - "type": "COMESTIBLE", - "id": "mushroom", - "name": "mushroom", - "weight": "70 g", - "color": "brown", - "spoils_in": "7 days", - "comestible_type": "FOOD", - "symbol": "%", - "healthy": 1, - "charges":10, - "calories": 15, - "description": "Mushrooms are tasty, but be careful. Some can poison you, while others are hallucinogenic.", - "price": "140 cent", - "price_postapoc": "50 cent", - "material": "mushroom", - "volume": "250 ml", - "fun": -3, - "flags": [ - "SMOKABLE", - "FORAGE_POISON", - "FORAGE_HALLU", - "RAW" - ], - "smoking_result": "dry_mushroom", - "//":"if we ever implement macro nutritients, mushrooms should be a good protein source.", - "vitamins": [ - [ - "vitC", - 2 - ], - [ - "iron", - 2 - ] - ] -} + "type": "COMESTIBLE", + "id": "mushroom", + "name": "mushroom", + "weight": "70 g", + "color": "brown", + "spoils_in": "7 days", + "comestible_type": "FOOD", + "symbol": "%", + "healthy": 1, + "charges": 10, + "calories": 15, + "description": "Mushrooms are tasty, but be careful. Some can poison you, while others are hallucinogenic.", + "price": "140 cent", + "price_postapoc": "50 cent", + "material": "mushroom", + "volume": "250 ml", + "fun": -3, + "flags": [ "SMOKABLE", "FORAGE_POISON", "FORAGE_HALLU", "RAW" ], + "smoking_result": "dry_mushroom", + "//": "if we ever implement macro nutritients, mushrooms should be a good protein source.", + "vitamins": [ [ "vitC", 2 ], [ "iron", 2 ] ] + } ] diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 259fefe76b34..499dc6d3bdb7 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -802,37 +802,31 @@ } }, { - "type": "COMESTIBLE", - "comestible_type": "FOOD", - "name": { - "str_sp": "mushroom culture" - }, - "category": "seeds", - "volume": "250 ml", - "weight": "100 g", - "price": "200 cent", - "price_postapoc": "25 cent", - "charges": 1, - "stack_size": 100, - "material": "veggy", - "primary_material": "mushroom", - "symbol": ".", - "color": "light_gray", - "flags": [ - "NUTRIENT_OVERRIDE", - "PLANTABLE_SEED", - "UNSAFE_CONSUME" - ], - "id": "mushroom_culture", - "copy-from": "seed", - "description": "A wet plant chunk, suitable for growing your own mushrooms. You need to \"plant\" it on logs or racks to grow though.", - "seed_data": { - "plant_name": "mushroom", - "fruit": "mushroom", - "fruit_div": 2, - "seeds":false, - "required_terrain_flag": "MUSHROOM_PLANTABLE", - "grow": "28 days" + "type": "COMESTIBLE", + "comestible_type": "FOOD", + "name": { "str_sp": "mushroom culture" }, + "category": "seeds", + "volume": "250 ml", + "weight": "100 g", + "price": "200 cent", + "price_postapoc": "25 cent", + "charges": 1, + "stack_size": 100, + "material": "veggy", + "primary_material": "mushroom", + "symbol": ".", + "color": "light_gray", + "flags": [ "NUTRIENT_OVERRIDE", "PLANTABLE_SEED", "UNSAFE_CONSUME" ], + "id": "mushroom_culture", + "copy-from": "seed", + "description": "A wet plant chunk, suitable for growing your own mushrooms. You need to \"plant\" it on logs or racks to grow though.", + "seed_data": { + "plant_name": "mushroom", + "fruit": "mushroom", + "fruit_div": 2, + "seeds": false, + "required_terrain_flag": "MUSHROOM_PLANTABLE", + "grow": "28 days" + } } -} ] From 529b228bf58c8970096164df654031ff94af687f Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:12:14 +0300 Subject: [PATCH 17/21] Update seeds.json --- data/json/recipes/food/seeds.json | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/data/json/recipes/food/seeds.json b/data/json/recipes/food/seeds.json index 227366954df3..e0ed16e312e4 100644 --- a/data/json/recipes/food/seeds.json +++ b/data/json/recipes/food/seeds.json @@ -364,6 +364,54 @@ "components": [ [ [ "mushroom", 1 ] ] ], "flags": [ "ALLOW_ROTTEN" ] }, + { + "type": "recipe", + "result": "mushroom_culture", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_SEEDS", + "skill_used": "survival", + "skills_required": ["cooking",4], + "difficulty": 4, + "time": "15 m", + "autolearn": false, + "book_learn": [ + [ + "pocket_survival", + 4 + ], + [ + "textbook_survival", + 4 + ], + [ + "atomic_survival", + 4 + ], + [ + "survival_book", + 4 + ] + ], + "batch_time_factors": [ 50, 3 ], + "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 1 },{ "id": "CUT", "level": 1 } ], + "tools": [ [ [ "surface_heat", 100, "LIST" ] ] ], + "components": [ + [ + [ "stick", 2 ], + [ "2x4", 1 ], + [ "splinter", 8 ], + [ "paper", 1000 ], + [ "cardboard", 200 ], + [ "tinder", 200 ], + [ "withered", 100 ], + [ "fertilizer_liquid", 3 ], + [ "fertilizer_commercial", 1 ], + [ "cattlefodder", 1 ] + ], + [ [ "mushroom", 5 ] ], + [ [ "water_clean", 30 ], [ "water", 30 ] ] + ] + }, { "result": "seed_mushroom_morel", "type": "recipe", From ea639a6e967cb8987f7cfe218e30b3b8164c9d33 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 08:12:59 +0000 Subject: [PATCH 18/21] style(autofix.ci): automated formatting --- data/json/recipes/food/seeds.json | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/data/json/recipes/food/seeds.json b/data/json/recipes/food/seeds.json index e0ed16e312e4..2f0a5c6a01b6 100644 --- a/data/json/recipes/food/seeds.json +++ b/data/json/recipes/food/seeds.json @@ -370,30 +370,13 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_SEEDS", "skill_used": "survival", - "skills_required": ["cooking",4], + "skills_required": [ "cooking", 4 ], "difficulty": 4, "time": "15 m", "autolearn": false, - "book_learn": [ - [ - "pocket_survival", - 4 - ], - [ - "textbook_survival", - 4 - ], - [ - "atomic_survival", - 4 - ], - [ - "survival_book", - 4 - ] - ], + "book_learn": [ [ "pocket_survival", 4 ], [ "textbook_survival", 4 ], [ "atomic_survival", 4 ], [ "survival_book", 4 ] ], "batch_time_factors": [ 50, 3 ], - "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 1 },{ "id": "CUT", "level": 1 } ], + "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 100, "LIST" ] ] ], "components": [ [ @@ -407,7 +390,7 @@ [ "fertilizer_liquid", 3 ], [ "fertilizer_commercial", 1 ], [ "cattlefodder", 1 ] - ], + ], [ [ "mushroom", 5 ] ], [ [ "water_clean", 30 ], [ "water", 30 ] ] ] From 5960a09f1be333e25eb38c36fc6fa4817d69e848 Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:50:24 +0300 Subject: [PATCH 19/21] revert seeds.json --- data/json/recipes/food/seeds.json | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/data/json/recipes/food/seeds.json b/data/json/recipes/food/seeds.json index 2f0a5c6a01b6..227366954df3 100644 --- a/data/json/recipes/food/seeds.json +++ b/data/json/recipes/food/seeds.json @@ -364,37 +364,6 @@ "components": [ [ [ "mushroom", 1 ] ] ], "flags": [ "ALLOW_ROTTEN" ] }, - { - "type": "recipe", - "result": "mushroom_culture", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_SEEDS", - "skill_used": "survival", - "skills_required": [ "cooking", 4 ], - "difficulty": 4, - "time": "15 m", - "autolearn": false, - "book_learn": [ [ "pocket_survival", 4 ], [ "textbook_survival", 4 ], [ "atomic_survival", 4 ], [ "survival_book", 4 ] ], - "batch_time_factors": [ 50, 3 ], - "qualities": [ { "id": "COOK", "level": 3 }, { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 100, "LIST" ] ] ], - "components": [ - [ - [ "stick", 2 ], - [ "2x4", 1 ], - [ "splinter", 8 ], - [ "paper", 1000 ], - [ "cardboard", 200 ], - [ "tinder", 200 ], - [ "withered", 100 ], - [ "fertilizer_liquid", 3 ], - [ "fertilizer_commercial", 1 ], - [ "cattlefodder", 1 ] - ], - [ [ "mushroom", 5 ] ], - [ [ "water_clean", 30 ], [ "water", 30 ] ] - ] - }, { "result": "seed_mushroom_morel", "type": "recipe", From 72b4ad538d20627c1241adc18f1f4b8d283c529d Mon Sep 17 00:00:00 2001 From: Ali-Anomma <59798817+Ali-Anomma@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:51:46 +0300 Subject: [PATCH 20/21] Update seed.json --- data/json/items/comestibles/seed.json | 28 --------------------------- 1 file changed, 28 deletions(-) diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index 499dc6d3bdb7..ce8c1378c40e 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -800,33 +800,5 @@ "grow": "14 days", "required_terrain_flag": "SHALLOW_WATER" } - }, - { - "type": "COMESTIBLE", - "comestible_type": "FOOD", - "name": { "str_sp": "mushroom culture" }, - "category": "seeds", - "volume": "250 ml", - "weight": "100 g", - "price": "200 cent", - "price_postapoc": "25 cent", - "charges": 1, - "stack_size": 100, - "material": "veggy", - "primary_material": "mushroom", - "symbol": ".", - "color": "light_gray", - "flags": [ "NUTRIENT_OVERRIDE", "PLANTABLE_SEED", "UNSAFE_CONSUME" ], - "id": "mushroom_culture", - "copy-from": "seed", - "description": "A wet plant chunk, suitable for growing your own mushrooms. You need to \"plant\" it on logs or racks to grow though.", - "seed_data": { - "plant_name": "mushroom", - "fruit": "mushroom", - "fruit_div": 2, - "seeds": false, - "required_terrain_flag": "MUSHROOM_PLANTABLE", - "grow": "28 days" - } } ] From ebf973ac2bb6d697062d234a95e0b8b46bf98780 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Wed, 3 Jul 2024 13:08:22 -0500 Subject: [PATCH 21/21] Double spaces go nyoooom --- data/json/furniture_and_terrain/terrain-manufactured.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index 568be825ff2f..b5304a59cbd7 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -259,7 +259,7 @@ "type": "terrain", "id": "t_secure_locker_l", "name": "locked secure locker", - "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is locked.", + "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is locked.", "symbol": "X", "color": "light_gray", "looks_like": "f_locker", @@ -290,7 +290,7 @@ "type": "terrain", "id": "t_secure_locker_c", "name": "closed secure locker", - "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is closed but not locked.", + "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is closed but not locked.", "symbol": "X", "color": "light_gray", "looks_like": "f_locker", @@ -318,7 +318,7 @@ "type": "terrain", "id": "t_secure_locker_o", "name": "open secure locker", - "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is open.", + "description": "A reinforced locker most commonly used for storing cargo or military equipment. This one is open.", "symbol": "X", "looks_like": "f_locker", "color": "light_gray",