Skip to content

Commit

Permalink
Removed redundant arrays for colors (#37187)
Browse files Browse the repository at this point in the history
Co-authored-by: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com>
  • Loading branch information
ZhilkinSerg and I-am-Erk committed Jan 21, 2020
1 parent 41b3ae2 commit 22b15d9
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 43 deletions.
4 changes: 2 additions & 2 deletions data/json/furniture_and_terrain/furniture-decorative.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"name": "bitts",
"description": "Paired vertical iron posts mounted on a wharf, pier or quay. They are used to secure mooring lines, ropes, hawsers, or cables.",
"symbol": "B",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost_mod": 2,
"coverage": 30,
"required_str": 0,
Expand All @@ -64,7 +64,7 @@
"name": "bitts",
"description": "Paired vertical iron posts mounted on a wharf, pier or quay. They are used to secure mooring lines, ropes, hawsers, or cables.",
"symbol": "B",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost_mod": 2,
"coverage": 30,
"required_str": 0,
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-terrains.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "tatami mat",
"description": "A tatami is a type of mat used as a flooring material in traditional Japanese-style rooms.",
"symbol": "#",
"color": [ "brown" ],
"color": "brown",
"move_cost_mod": 0,
"comfort": 2,
"floor_bedding_warmth": -1500,
Expand Down
6 changes: 3 additions & 3 deletions data/json/furniture_and_terrain/terrain-floors_indoor.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
"name": "waxed floor",
"description": "Hardwood flooring that has been treated with chemicals to improve slip resistance and sliding, commonly for recreational sports.",
"symbol": ".",
"color": [ "light_red" ],
"color": "light_red",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
Expand Down Expand Up @@ -550,7 +550,7 @@
"name": "painted waxed floor",
"description": "This section of wax flooring has been painted.",
"symbol": ".",
"color": [ "yellow" ],
"color": "yellow",
"move_cost": 2,
"roof": "t_flat_roof",
"bash": {
Expand Down Expand Up @@ -622,7 +622,7 @@
"name": "painted waxed floor",
"description": "This section of wax flooring has been painted.",
"symbol": ".",
"color": [ "yellow" ],
"color": "yellow",
"move_cost": 2,
"roof": "t_flat_roof",
"bash": {
Expand Down
10 changes: 5 additions & 5 deletions data/json/furniture_and_terrain/terrain-manufactured.json
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@
"name": "milking machine",
"description": "A machine used in the dairy industry to milk cows.",
"symbol": "%",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost": 1,
"bash": {
"str_min": 10,
Expand Down Expand Up @@ -1308,7 +1308,7 @@
"name": "bulk tank",
"description": "A heavy, high capacity tank.",
"symbol": "O",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost": 0,
"coverage": 85,
"bash": {
Expand Down Expand Up @@ -1343,7 +1343,7 @@
"name": "root cellar",
"symbol": "=",
"description": "A cellar dug into the earth for storing food in a cool environment.",
"color": [ "green" ],
"color": "green",
"move_cost": 0,
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "INDOORS", "DECONSTRUCT" ],
"deconstruct": { "ter_set": "t_pit", "items": [ { "item": "rock", "count": 40 }, { "item": "stick", "count": [ 16, 16 ] } ] },
Expand Down Expand Up @@ -1405,7 +1405,7 @@
"name": "pine lean-to",
"description": "A small shelter roofed with pine leaves, that can be used to take refuge from the elements or to protect a campfire from the rain.",
"symbol": ";",
"color": [ "brown" ],
"color": "brown",
"move_cost": 2,
"bash": {
"str_min": 4,
Expand All @@ -1427,7 +1427,7 @@
"name": "tarp lean-to",
"description": "A small shelter covered by waterproof tarp, that can be used to take refuge from the elements or to protect a campfire from the rain.",
"symbol": ";",
"color": [ "light_blue" ],
"color": "light_blue",
"move_cost": 2,
"bash": {
"str_min": 6,
Expand Down
46 changes: 23 additions & 23 deletions data/json/furniture_and_terrain/terrain-railroads.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "gravel",
"description": "A small mallet that a judge uses to call - er, wait. Oh, gravel! Gravel is a collection of small stones often used for roads, as railroad ballast, and in many other applications.",
"symbol": ",",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost": 2,
"bash": {
"str_min": 30,
Expand All @@ -31,7 +31,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -62,7 +62,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -93,7 +93,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -124,7 +124,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -155,7 +155,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -186,7 +186,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -217,7 +217,7 @@
"name": "railroad tie",
"description": "This crosstie is used to support the rails.",
"symbol": "#",
"color": [ "dark_gray_yellow" ],
"color": "dark_gray_yellow",
"move_cost": 2,
"bash": {
"str_min": 10,
Expand All @@ -240,7 +240,7 @@
"name": "railroad tie",
"description": "This crosstie is used to support the rails.",
"symbol": "#",
"color": [ "dark_gray_yellow" ],
"color": "dark_gray_yellow",
"move_cost": 2,
"bash": {
"str_min": 10,
Expand All @@ -263,7 +263,7 @@
"name": "railroad tie",
"description": "This crosstie is used to support the rails.",
"symbol": "#",
"color": [ "dark_gray_yellow" ],
"color": "dark_gray_yellow",
"move_cost": 2,
"bash": {
"str_min": 10,
Expand All @@ -286,7 +286,7 @@
"name": "railroad tie",
"description": "This crosstie is used to support the rails.",
"symbol": "#",
"color": [ "dark_gray_yellow" ],
"color": "dark_gray_yellow",
"move_cost": 2,
"bash": {
"str_min": 10,
Expand All @@ -309,7 +309,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm. A crosstie sits underneath, supporting the rails.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -343,7 +343,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm. A crosstie sits underneath, supporting the rails.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -377,7 +377,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm. A crosstie sits underneath, supporting the rails.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -411,7 +411,7 @@
"name": "railroad track",
"description": "Trains used to chug along on these. These rail tracks stand unused in the face of the Cataclysm. A crosstie sits underneath, supporting the rails.",
"symbol": "X",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"bash": {
"str_min": 60,
Expand Down Expand Up @@ -445,7 +445,7 @@
"name": "buffer stop",
"description": "A tiny blockade on the train tracks, meant to signify the end of a track, or mark a 'no-go' zone for trains.",
"symbol": "S",
"color": [ "brown" ],
"color": "brown",
"move_cost": 3,
"bash": {
"str_min": 4,
Expand All @@ -463,7 +463,7 @@
"name": "railroad tie",
"description": "This crosstie is used to support the rails.",
"symbol": "/",
"color": [ "dark_gray_yellow" ],
"color": "dark_gray_yellow",
"move_cost": 2,
"bash": {
"str_min": 10,
Expand All @@ -486,7 +486,7 @@
"name": "railroad tie",
"description": "This crosstie is used to support the rails.",
"symbol": "\\",
"color": [ "dark_gray_yellow" ],
"color": "dark_gray_yellow",
"move_cost": 2,
"bash": {
"str_min": 10,
Expand All @@ -509,7 +509,7 @@
"name": "railroad crossing signal",
"description": "Traffic lights meant to light and make noise when a train approaches, to prevent people from turning into meaty mush while they cross the tracks. Won't stop people from turning into meaty mush by other means, though.",
"symbol": "1",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost": 0,
"bash": {
"str_min": 16,
Expand All @@ -533,7 +533,7 @@
"description": "A traffic sign intended to indicate a level railway crossing. If the trains were still running.",
"name": "crossbuck",
"symbol": "X",
"color": [ "brown" ],
"color": "brown",
"move_cost": 0,
"bash": {
"str_min": 6,
Expand All @@ -555,7 +555,7 @@
"name": "crossbuck",
"description": "A traffic sign intended to indicate a level railway crossing. If the trains were still running.",
"symbol": "X",
"color": [ "light_gray" ],
"color": "light_gray",
"move_cost": 0,
"bash": {
"str_min": 10,
Expand All @@ -573,7 +573,7 @@
"name": "small railroad track",
"description": "Like a railroad track, only smaller. You could probably run a small vehicle on this.",
"symbol": "=",
"color": [ "cyan" ],
"color": "cyan",
"move_cost": 3,
"looks_like": "t_railroad_track",
"bash": {
Expand Down Expand Up @@ -607,7 +607,7 @@
"name": "small railroad track",
"description": "Like a railroad track, only smaller. You could probably run a small vehicle on this.",
"symbol": "=",
"color": [ "cyan" ],
"color": "cyan",
"looks_like": "t_railroad_track_d",
"move_cost": 3,
"bash": {
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain-recreational.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"description": "A metal backboard.",
"symbol": "7",
"looks_like": "t_backboard",
"color": [ "red" ],
"color": "red",
"move_cost": 0,
"roof": "t_flat_roof",
"bash": {
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain-roofs.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"name": "open air",
"description": "This is open air.",
"symbol": " ",
"color": [ "i_cyan" ],
"color": "i_cyan",
"move_cost": 2,
"trap": "tr_ledge",
"roof": "t_flat_roof",
Expand Down
6 changes: 3 additions & 3 deletions data/json/furniture_and_terrain/terrain-walls.json
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@
"name": "wattle-and-daub wall",
"description": "A relatively primitive wall made by daubing together a lattice of wooden strips using some combination of wet soil, clay, sand, animal dung and straw.",
"symbol": "LINE_OXOX",
"color": [ "light_red" ],
"color": "light_red",
"move_cost": 0,
"coverage": 100,
"roof": "t_thatch_roof",
Expand All @@ -770,7 +770,7 @@
"name": "broken wattle-and-daub wall",
"description": "This wattle-and-daub wall section has been destroyed, leaving mostly just frame, and is barely held together.",
"symbol": "&",
"color": [ "light_red" ],
"color": "light_red",
"move_cost": 0,
"bash": {
"str_min": 4,
Expand All @@ -788,7 +788,7 @@
"name": "half-built wattle-and-daub wall",
"description": "This wattle-and-daub wall has some of the wooden strip lattice in place, and still requires the rest of the lattice and supporting wet compound to be filled in.",
"symbol": "#",
"color": [ "light_red" ],
"color": "light_red",
"move_cost": 4,
"coverage": 60,
"bash": {
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/maps/terrain.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "nuclear reactor core",
"description": "",
"symbol": "R",
"color": [ "light_green" ],
"color": "light_green",
"move_cost": 0,
"flags": [ "TRANSPARENT", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "PLACE_ITEM" ]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "filing cabinet",
"description": "",
"symbol": "}",
"color": [ "dark_gray" ],
"color": "dark_gray",
"move_cost_mod": 2,
"max_volume": "1000 L",
"required_str": 8,
Expand Down
4 changes: 2 additions & 2 deletions data/mods/blazemod/blaze_blob_construct.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"name": "mass of blob feed",
"description": "",
"symbol": "O",
"color": [ "light_green" ],
"color": "light_green",
"move_cost": 0,
"bash": {
"str_min": 1,
Expand All @@ -47,7 +47,7 @@
"name": "mound of blob feed",
"description": "",
"symbol": "O",
"color": [ "light_green" ],
"color": "light_green",
"move_cost": 0,
"bash": {
"str_min": 1,
Expand Down

0 comments on commit 22b15d9

Please sign in to comment.