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

Vehicle part name to object #38869

Merged
merged 6 commits into from
Mar 18, 2020
Merged

Vehicle part name to object #38869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc220e1
Vehicle part name to object
snipercup Mar 18, 2020
5caa62c
Name to object
snipercup Mar 18, 2020
45f17d6
Name to object
snipercup Mar 18, 2020
8b873db
Name to object
snipercup Mar 18, 2020
7cfcdb5
Name to object
snipercup Mar 18, 2020
f3fabb2
Name to object
snipercup Mar 18, 2020
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/vehicleparts/armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{
"id": "spring_plate",
"type": "vehicle_part",
"name": "shock absorber",
"name": { "str": "shock absorber" },
"item": "spring_plate",
"location": "armor",
"symbol": "X",
Expand Down
4 changes: 2 additions & 2 deletions data/json/vehicleparts/battery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
"id": "small_storage_battery",
"copy-from": "storage_battery",
"type": "vehicle_part",
"name": "small storage battery",
"name": { "str": "small storage battery" },
"item": "small_storage_battery",
"difficulty": 1,
"durability": 100,
Expand All @@ -114,7 +114,7 @@
{
"id": "storage_battery",
"type": "vehicle_part",
"name": "storage battery",
"name": { "str": "storage battery" },
"item": "storage_battery",
"location": "fuel_source",
"fuel_type": "battery",
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/boards.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
{
"abstract": "stowboard",
"type": "vehicle_part",
"name": "stow board",
"name": { "str": "stow board" },
"item": "sheet_metal",
"location": "center",
"color": "white",
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/motor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"id": "engine_electric_small",
"copy-from": "engine_motor",
"type": "vehicle_part",
"name": "small electric motor",
"name": { "str": "small electric motor" },
"item": "motor_small",
"durability": 120,
"power": 7040,
Expand Down
6 changes: 3 additions & 3 deletions data/json/vehicleparts/rams.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"id": "ram_spiked",
"copy-from": "ram_blaze",
"type": "vehicle_part",
"name": "spiked ram",
"name": { "str": "spiked ram" },
"item": "spiked_plate",
"color": "red",
"broken_color": "red",
Expand All @@ -105,7 +105,7 @@
"id": "ram_steel",
"copy-from": "ram_blaze",
"type": "vehicle_part",
"name": "steel ram",
"name": { "str": "steel ram" },
"item": "steel_plate",
"color": "light_cyan",
"broken_color": "light_cyan",
Expand Down Expand Up @@ -172,7 +172,7 @@
{
"id": "tearer",
"type": "vehicle_part",
"name": "shredder",
"name": { "str": "shredder" },
"item": "tearer",
"location": "structure",
"symbol": "*",
Expand Down
4 changes: 2 additions & 2 deletions data/json/vehicleparts/tanks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
{
"id": "tank_30gal_drum",
"type": "vehicle_part",
"name": "steel drum (100L)",
"name": { "str": "steel drum (100L)" },
"item": "30gal_drum",
"location": "center",
"symbol": "0",
Expand All @@ -192,7 +192,7 @@
"id": "tank_55gal_drum",
"copy-from": "tank_30gal_drum",
"type": "vehicle_part",
"name": "steel drum (200L)",
"name": { "str": "steel drum (200L)" },
"item": "55gal_drum",
"size": 200000,
"breaks_into": [
Expand Down
36 changes: 18 additions & 18 deletions data/json/vehicleparts/vehicle_parts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
{
"type": "vehicle_part",
"id": "seat",
"name": "seat",
"name": { "str": "seat" },
"symbol": "#",
"looks_like": "reclining_seat",
"color": "red",
Expand Down Expand Up @@ -259,7 +259,7 @@
{
"type": "vehicle_part",
"id": "saddle",
"name": "saddle",
"name": { "str": "saddle" },
"symbol": "#",
"looks_like": "seat",
"color": "red",
Expand Down Expand Up @@ -854,7 +854,7 @@
{
"type": "vehicle_part",
"id": "spike",
"name": "spike",
"name": { "str": "spike" },
"symbol": ".",
"color": "white",
"broken_symbol": "x",
Expand Down Expand Up @@ -1253,7 +1253,7 @@
{
"type": "vehicle_part",
"id": "cargo_bag",
"name": "storage bag",
"name": { "str": "storage bag" },
"symbol": "o",
"color": "light_gray",
"broken_symbol": "#",
Expand Down Expand Up @@ -1298,7 +1298,7 @@
{
"type": "vehicle_part",
"id": "basketlg",
"name": "shopping cart basket",
"name": { "str": "shopping cart basket" },
"symbol": "o",
"looks_like": "basketsm",
"color": "brown",
Expand Down Expand Up @@ -1566,7 +1566,7 @@
{
"type": "vehicle_part",
"id": "sail",
"name": "sail",
"name": { "str": "sail" },
"symbol": "M",
"color": "light_gray",
"broken_symbol": "#",
Expand Down Expand Up @@ -1797,7 +1797,7 @@
{
"type": "vehicle_part",
"id": "seatbelt",
"name": "seatbelt",
"name": { "str": "seatbelt" },
"symbol": ",",
"color": "light_gray",
"broken_symbol": ",",
Expand All @@ -1820,7 +1820,7 @@
{
"type": "vehicle_part",
"id": "vehicle_alarm",
"name": "security system",
"name": { "str": "security system" },
"symbol": ",",
"color": "light_red",
"broken_symbol": ",",
Expand Down Expand Up @@ -1971,7 +1971,7 @@
{
"type": "vehicle_part",
"id": "solar_panel",
"name": "solar panel",
"name": { "str": "solar panel" },
"symbol": "#",
"color": "yellow",
"broken_symbol": "x",
Expand Down Expand Up @@ -2405,7 +2405,7 @@
{
"type": "vehicle_part",
"id": "plating_steel",
"name": "steel plating",
"name": { "str": "steel plating" },
"symbol": ")",
"color": "light_cyan",
"broken_symbol": ")",
Expand Down Expand Up @@ -2449,7 +2449,7 @@
{
"type": "vehicle_part",
"id": "plating_spiked",
"name": "spiked plating",
"name": { "str": "spiked plating" },
"symbol": ")",
"color": "red",
"broken_symbol": ")",
Expand Down Expand Up @@ -2680,7 +2680,7 @@
{
"type": "vehicle_part",
"id": "door_shutter",
"name": "shutter door",
"name": { "str": "shutter door" },
"looks_like": "hatch",
"symbol": "+",
"color": "white",
Expand All @@ -2703,7 +2703,7 @@
{
"type": "vehicle_part",
"id": "door_sliding",
"name": "sliding door",
"name": { "str": "sliding door" },
"symbol": "+",
"looks_like": "door",
"color": "light_cyan",
Expand Down Expand Up @@ -2866,7 +2866,7 @@
{
"type": "vehicle_part",
"id": "stereo",
"name": "stereo system",
"name": { "str": "stereo system" },
"symbol": "&",
"color": "red",
"broken_symbol": "&",
Expand Down Expand Up @@ -2952,7 +2952,7 @@
{
"type": "vehicle_part",
"id": "jumper_cable_debug",
"name": "shiny cable",
"name": { "str": "shiny cable" },
"symbol": "{",
"color": "yellow",
"broken_symbol": "*",
Expand Down Expand Up @@ -3175,7 +3175,7 @@
{
"type": "vehicle_part",
"id": "omnicam",
"name": "security camera",
"name": { "str": "security camera" },
"symbol": "o",
"color": "light_red",
"broken_symbol": "#",
Expand Down Expand Up @@ -3365,7 +3365,7 @@
{
"type": "vehicle_part",
"id": "vehicle_scoop",
"name": "scoop",
"name": { "str": "scoop" },
"symbol": "R",
"color": "light_gray",
"broken_symbol": ";",
Expand Down Expand Up @@ -3435,7 +3435,7 @@
{
"type": "vehicle_part",
"id": "seed_drill",
"name": "seed drill",
"name": { "str": "seed drill" },
"symbol": "8",
"color": "blue",
"broken_symbol": "*",
Expand Down
2 changes: 1 addition & 1 deletion data/json/vehicleparts/wheel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@
{
"id": "wheel_small",
"type": "vehicle_part",
"name": "small wheel",
"name": { "str": "small wheel" },
"item": "wheel_small",
"location": "under",
"symbol": "o",
Expand Down