Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change CRT TV to LCD TV and Add Large LCD Screen Component #35320

Merged
merged 8 commits into from
Nov 14, 2019
Merged

Change CRT TV to LCD TV and Add Large LCD Screen Component #35320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d7be58
Changes to CRT TV and it's Components
HarrisonGreenlee Nov 4, 2019
ad6c210
Changes to CRT TV and its Components
HarrisonGreenlee Nov 4, 2019
af37a3d
Merge branch 'Flatscreen-TV' of https://github.com/HarrisonGreenlee/C…
HarrisonGreenlee Nov 4, 2019
bb95978
Decreased weight of LCD TV
HarrisonGreenlee Nov 5, 2019
33b0bbd
Fixed large_lcd_screen price and added large_lcd_screen to other devices
HarrisonGreenlee Nov 5, 2019
0eb0d88
LCD deconstruction and remote vehicle control recipe change
HarrisonGreenlee Nov 5, 2019
a600447
Increased weight and volume of large LCD screen
HarrisonGreenlee Nov 10, 2019
c97fe3c
Increased weight and volume of LCD TV
HarrisonGreenlee Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/construction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3158,7 +3158,7 @@
"components": [
[ [ "processor", 2 ] ],
[ [ "RAM", 2 ] ],
[ [ "small_lcd_screen", 1 ] ],
[ [ "large_lcd_screen", 1 ] ],
[ [ "e_scrap", 8 ] ],
[ [ "frame", 1 ] ],
[ [ "circuit", 4 ] ],
Expand Down
5 changes: 3 additions & 2 deletions data/json/furniture_and_terrain/terrain-manufactured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand All @@ -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 },
Expand Down Expand Up @@ -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 },
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
{ "item": "e_scrap", "count": [ 12, 24 ] },
{ "item": "circuit", "count": [ 6, 10 ] },
{ "item": "power_supply", "count": [ 4, 8 ] },
Expand Down
8 changes: 4 additions & 4 deletions data/json/furniture_and_terrain/terrain-mechanisms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand All @@ -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 },
Expand Down Expand Up @@ -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 ] },
Expand All @@ -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 },
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/itemgroups/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
20 changes: 17 additions & 3 deletions data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/basecamps/recipe_modular_field_common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@
"components": [
[ [ "processor", 2 ] ],
[ [ "RAM", 2 ] ],
[ [ "small_lcd_screen", 1 ] ],
[ [ "large_lcd_screen", 1 ] ],
[ [ "e_scrap", 8 ] ],
[ [ "frame", 1 ] ],
[ [ "circuit", 4 ] ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/basecamps/recipe_primitive_field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"components": [
[ [ "processor", 2 ] ],
[ [ "RAM", 2 ] ],
[ [ "small_lcd_screen", 1 ] ],
[ [ "large_lcd_screen", 1 ] ],
[ [ "e_scrap", 8 ] ],
[ [ "frame", 1 ] ],
[ [ "circuit", 4 ] ],
Expand Down
17 changes: 17 additions & 0 deletions data/json/recipes/recipe_deconstruction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -2338,6 +2354,7 @@
"time": "1 h",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"components": [
[ [ "large_lcd_screen", 1 ] ],
[ [ "processor", 1 ] ],
[ [ "RAM", 2 ] ],
[ [ "cable", 8 ] ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_electronics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2163,7 +2163,7 @@
[ [ "antenna", 1 ] ],
[ [ "processor", 1 ] ],
[ [ "RAM", 1 ] ],
[ [ "small_lcd_screen", 1 ] ]
[ [ "large_lcd_screen", 1 ] ]
]
},
{
Expand Down