diff --git a/data/json/construction.json b/data/json/construction.json index 2039c185b09d1..d254bba7a076c 100644 --- a/data/json/construction.json +++ b/data/json/construction.json @@ -3158,7 +3158,7 @@ "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ], - [ [ "small_lcd_screen", 1 ] ], + [ [ "large_lcd_screen", 1 ] ], [ [ "e_scrap", 8 ] ], [ [ "frame", 1 ] ], [ [ "circuit", 4 ] ], diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index 7b8f805aacacf..e9a7ec7e0bf5f 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -294,7 +294,7 @@ { "item": "processor", "count": [ 1, 2 ] }, { "item": "RAM", "count": [ 4, 8 ] }, { "item": "cable", "charges": [ 4, 6 ] }, - { "item": "small_lcd_screen", "count": [ 1, 2 ] }, + { "item": "large_lcd_screen", "count": 1 }, { "item": "e_scrap", "count": [ 10, 16 ] }, { "item": "circuit", "count": [ 6, 10 ] }, { "item": "power_supply", "count": [ 2, 4 ] }, @@ -313,7 +313,7 @@ { "item": "processor", "prob": 25 }, { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, - { "item": "small_lcd_screen", "prob": 25 }, + { "item": "large_lcd_screen", "prob": 25 }, { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, { "item": "power_supply", "prob": 25 }, @@ -640,6 +640,7 @@ { "item": "RAM", "count": [ 4, 8 ] }, { "item": "cable", "charges": [ 8, 16 ] }, { "item": "small_lcd_screen", "count": [ 2, 4 ] }, + { "item": "large_lcd_screen", "count": 1 }, { "item": "e_scrap", "count": [ 12, 24 ] }, { "item": "circuit", "count": [ 6, 10 ] }, { "item": "power_supply", "count": [ 4, 8 ] }, diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json index 5d1fbaea6348b..7c2d7515c3063 100644 --- a/data/json/furniture_and_terrain/terrain-mechanisms.json +++ b/data/json/furniture_and_terrain/terrain-mechanisms.json @@ -16,7 +16,7 @@ { "item": "processor", "count": [ 1, 2 ] }, { "item": "RAM", "count": [ 4, 8 ] }, { "item": "cable", "charges": [ 4, 6 ] }, - { "item": "small_lcd_screen", "count": [ 1, 2 ] }, + { "item": "large_lcd_screen", "count": 1 }, { "item": "e_scrap", "count": [ 10, 16 ] }, { "item": "circuit", "count": [ 6, 10 ] }, { "item": "power_supply", "count": [ 2, 4 ] }, @@ -35,7 +35,7 @@ { "item": "processor", "prob": 25 }, { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, - { "item": "small_lcd_screen", "prob": 25 }, + { "item": "large_lcd_screen", "prob": 25 }, { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, { "item": "power_supply", "prob": 25 }, @@ -63,7 +63,7 @@ { "item": "processor", "count": [ 1, 2 ] }, { "item": "RAM", "count": [ 4, 8 ] }, { "item": "cable", "charges": [ 4, 6 ] }, - { "item": "small_lcd_screen", "count": [ 1, 2 ] }, + { "item": "large_lcd_screen", "count": 1 }, { "item": "e_scrap", "count": [ 10, 16 ] }, { "item": "circuit", "count": [ 6, 10 ] }, { "item": "power_supply", "count": [ 2, 4 ] }, @@ -82,7 +82,7 @@ { "item": "processor", "prob": 25 }, { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, - { "item": "small_lcd_screen", "prob": 25 }, + { "item": "large_lcd_screen", "prob": 25 }, { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, { "item": "power_supply", "prob": 25 }, diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 3807ff72382cf..329cae55dafe9 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -8265,7 +8265,8 @@ { "item": "two_way_radio", "prob": 30, "charges-min": 0, "charges-max": 15 }, [ "transponder", 25 ], [ "receiver", 25 ], - [ "small_lcd_screen", 20 ], + [ "small_lcd_screen", 10 ], + [ "large_lcd_screen", 10 ], [ "mobile_memory_card", 35 ], [ "mobile_memory_card_used", 35 ], [ "mobile_memory_card_encrypted", 35 ], diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index e8c9b1d061e5e..07e539e85ca87 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -1369,7 +1369,8 @@ [ "e_scrap", 95 ], [ "antenna", 50 ], [ "circuit", 35 ], - [ "small_lcd_screen", 20 ], + [ "small_lcd_screen", 10 ], + [ "large_lcd_screen", 10 ], [ "RAM", 35 ], [ "processor", 10 ], [ "amplifier", 7 ], diff --git a/data/json/items/generic.json b/data/json/items/generic.json index cc2aad099507a..77205627ed2e5 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -817,11 +817,11 @@ "symbol": ";", "color": "dark_gray", "name": "television", - "description": "A large cathode ray tube television, full of delicious electronics.", + "description": "A large LCD television, full of delicious electronics.", "price": 0, "material": "plastic", - "weight": "22600 g", - "volume": "3 L", + "weight": "15000 g", + "volume": "20 L", "bashing": 5, "to_hit": -5 }, @@ -1383,6 +1383,20 @@ "volume": "250 ml", "to_hit": -1 }, + { + "type": "GENERIC", + "id": "large_lcd_screen", + "symbol": ",", + "color": "dark_gray", + "name": "large LCD screen", + "category": "spare_parts", + "description": "A large backlit screen, used for displaying images. Useful in some electronics recipes.", + "price": 10000, + "material": "plastic", + "weight": "13000 g", + "volume": "15000 ml", + "to_hit": -4 + }, { "type": "GENERIC", "id": "small_lcd_screen", diff --git a/data/json/recipes/basecamps/recipe_modular_field_common.json b/data/json/recipes/basecamps/recipe_modular_field_common.json index d352d4bf85962..e0387d8a12eb1 100644 --- a/data/json/recipes/basecamps/recipe_modular_field_common.json +++ b/data/json/recipes/basecamps/recipe_modular_field_common.json @@ -594,7 +594,7 @@ "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ], - [ [ "small_lcd_screen", 1 ] ], + [ [ "large_lcd_screen", 1 ] ], [ [ "e_scrap", 8 ] ], [ [ "frame", 1 ] ], [ [ "circuit", 4 ] ], diff --git a/data/json/recipes/basecamps/recipe_primitive_field.json b/data/json/recipes/basecamps/recipe_primitive_field.json index ffebaf7ae5406..9e9aa45d0c844 100644 --- a/data/json/recipes/basecamps/recipe_primitive_field.json +++ b/data/json/recipes/basecamps/recipe_primitive_field.json @@ -442,7 +442,7 @@ "components": [ [ [ "processor", 2 ] ], [ [ "RAM", 2 ] ], - [ [ "small_lcd_screen", 1 ] ], + [ [ "large_lcd_screen", 1 ] ], [ [ "e_scrap", 8 ] ], [ [ "frame", 1 ] ], [ [ "circuit", 4 ] ], diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 1e49c2cc49b36..01e83e463285c 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -1762,6 +1762,22 @@ [ [ "small_storage_battery", 2 ] ] ] }, + { + "result": "large_lcd_screen", + "type": "uncraft", + "skill_used": "electronics", + "time": "30 m", + "using": [ [ "soldering_standard", 15 ] ], + "components": [ [ [ "e_scrap", 3 ] ], [ [ "plastic_chunk", 5 ] ] ] + }, + { + "result": "small_lcd_screen", + "type": "uncraft", + "skill_used": "electronics", + "time": "10 m", + "using": [ [ "soldering_standard", 5 ] ], + "components": [ [ [ "e_scrap", 1 ] ], [ [ "plastic_chunk", 2 ] ] ] + }, { "result": "basket_laundry", "type": "uncraft", @@ -2338,6 +2354,7 @@ "time": "1 h", "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ + [ [ "large_lcd_screen", 1 ] ], [ [ "processor", 1 ] ], [ [ "RAM", 2 ] ], [ [ "cable", 8 ] ], diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index a1064061c85a1..3ae02eaf877bf 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -2163,7 +2163,7 @@ [ [ "antenna", 1 ] ], [ [ "processor", 1 ] ], [ [ "RAM", 1 ] ], - [ [ "small_lcd_screen", 1 ] ] + [ [ "large_lcd_screen", 1 ] ] ] }, {