Skip to content

Commit

Permalink
Merge pull request #77523 from ShnitzelX2/remove-terrain-alias
Browse files Browse the repository at this point in the history
Remove furniture/terrain legacy alias code and JSON
  • Loading branch information
Maleclypse authored Nov 3, 2024
2 parents 9ed75c9 + dc1d11a commit 9f98a02
Show file tree
Hide file tree
Showing 122 changed files with 549 additions and 729 deletions.
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-industrial.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"id": "f_xedra_antenna",
"name": "mobile antenna",
"symbol": "1",
"looks_like": "f_small_satelitte_dish",
"looks_like": "f_small_satellite_dish",
"description": "A stark black directional antenna, seemingly part of a monitoring setup. An LED mounted on its back lights up with a lazy and irregular rhythm.",
"color": "dark_gray",
"move_cost_mod": 1,
Expand Down
1 change: 0 additions & 1 deletion data/json/furniture_and_terrain/furniture-recreation.json
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@
{
"type": "furniture",
"id": "f_punching_bag",
"alias": "f_floor_canvas",
"looks_like": "f_floor_canvas",
"name": "heavy punching bag",
"description": "A hefty, oblong leather bag, suspended from a ceiling mount with a steel chain. It can be used for exercise and combat training, with the notable advantage that it doesn't fight back.",
Expand Down
1 change: 0 additions & 1 deletion data/json/furniture_and_terrain/furniture-roof.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
{
"type": "furniture",
"id": "f_small_satellite_dish",
"alias": [ "f_small_satelitte_dish" ],
"name": "satellite dish",
"description": "A small sheet metal disc designed to receive radio waves from orbital satellites. Satellites that will assuredly continue to orbit, with nothing to broadcast.",
"symbol": "(",
Expand Down
11 changes: 0 additions & 11 deletions data/json/furniture_and_terrain/terrain-fences-gates.json
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@
{
"type": "terrain",
"id": "t_fence",
"alias": [ "t_fence_h", "t_fence_v" ],
"name": "picket fence",
"description": "A barrier made of wood, it's nothing complicated. Mildly suggests where not to go.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -549,7 +548,6 @@
{
"type": "terrain",
"id": "t_wattle_fence",
"alias": [ "t_wattle_fence_h", "t_wattle_fence_v" ],
"name": "woven wattle fence",
"description": "A flimsy barrier made of woven sticks. Suitable for small animals.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -604,7 +602,6 @@
{
"type": "terrain",
"id": "t_chainfence",
"alias": [ "t_chainfence_h", "t_chainfence_v" ],
"name": "chain link fence",
"description": "A tall fence made of woven wires. There aren't any gaps big enough for you to fit through, so you'll have to cut it, climb it, or find a way around.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -672,7 +669,6 @@
{
"type": "terrain",
"id": "t_chickenwire_fence",
"alias": [ "t_chickenwire_fence_h", "t_chickenwire_fence_v" ],
"name": "chickenwire fence",
"description": "A tall, rather flimsy fence made of planks and woven wire, suitable for containing small livestock like chickens.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -838,7 +834,6 @@
{
"type": "terrain",
"id": "t_splitrail_fence",
"alias": [ "t_splitrail_fence_h", "t_splitrail_fence_v" ],
"name": "split rail fence",
"description": "A rather stout fence made of planks and fence posts, suitable for containing livestock like horses, cows and pigs.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -1066,7 +1061,6 @@
{
"type": "terrain",
"id": "t_privacy_fence",
"alias": [ "t_privacy_fence_h", "t_privacy_fence_v" ],
"name": "wooden privacy fence",
"description": "A rather stout fence made of planks and fence posts, it is tall enough to prevent people from seeing into your yard.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -1168,7 +1162,6 @@
{
"type": "terrain",
"id": "t_railing",
"alias": [ "t_railing_h", "t_railing_v" ],
"name": "railing",
"description": "A section of wooden railing.",
"symbol": "LINE_OXOX",
Expand All @@ -1194,7 +1187,6 @@
{
"type": "terrain",
"id": "t_glass_railing",
"alias": [ "t_glass_railing_h", "t_glass_railing_v" ],
"name": "glass railing",
"description": "A section of railing made out of glass.",
"symbol": "LINE_OXOX",
Expand All @@ -1220,7 +1212,6 @@
{
"type": "terrain",
"id": "t_metal_railing",
"alias": [ "t_metal__railing_h", "t_metal__railing_v" ],
"name": "metal railing",
"description": "A section of metal railing.",
"symbol": "LINE_OXOX",
Expand All @@ -1246,7 +1237,6 @@
{
"type": "terrain",
"id": "t_concrete_railing",
"alias": [ "t_concrete_railing_h", "t_concrete_railing_v" ],
"name": "concrete railing",
"description": "A section of cemented concrete railing.",
"symbol": "LINE_OXOX",
Expand Down Expand Up @@ -1328,7 +1318,6 @@
{
"type": "terrain",
"id": "t_cattle_feeder",
"alias": [ "t_cattle_feeder_h", "t_cattle_feeder_v" ],
"name": "cattle feeder",
"description": "A section of tall steel with a solid base and feed spaces above to allow livestock to reach the contained food.",
"symbol": "LINE_OXOX",
Expand Down
7 changes: 0 additions & 7 deletions data/json/furniture_and_terrain/terrain-floors-indoor.json
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,6 @@
"id": "t_carpet_concrete_red",
"copy-from": "t_carpet_base_concrete",
"name": "industrial red carpet",
"alias": "t_carpet_concrete",
"looks_like": "t_carpet_red",
"symbol": ".",
"color": "red",
Expand Down Expand Up @@ -966,7 +965,6 @@
"id": "t_carpet_metal_yellow",
"copy-from": "t_carpet_base_metal",
"name": "bunker yellow carpet",
"alias": "t_carpet_metal",
"description": "Firm, low-pile, totally non-flammable carpet in a yellow color, with an insulation layer beneath on a metal floor. Can support a roof.",
"symbol": ".",
"color": "yellow",
Expand Down Expand Up @@ -1030,7 +1028,6 @@
"id": "t_carpet_strconcrete_red",
"copy-from": "t_carpet_base_strconcrete",
"name": "industrial red carpet",
"alias": "t_carpet_concrete",
"looks_like": "t_carpet_red",
"symbol": ".",
"color": "red",
Expand Down Expand Up @@ -1107,7 +1104,6 @@
"id": "t_carpet_rock_red",
"copy-from": "t_carpet_base_rock",
"name": "red carpet",
"alias": "t_carpet_rock",
"looks_like": "t_carpet_red",
"symbol": ".",
"color": "red",
Expand Down Expand Up @@ -1188,7 +1184,6 @@
"id": "t_carpet_primitive_red",
"copy-from": "t_carpet_base_primitive",
"name": "red carpet",
"alias": "t_carpet_primitive",
"looks_like": "t_carpet_red",
"symbol": ".",
"color": "red",
Expand Down Expand Up @@ -1269,7 +1264,6 @@
"id": "t_carpet_linoleum_gray_red",
"copy-from": "t_carpet_base_linoleum_gray",
"name": "red carpet",
"alias": "t_carpet_linoleum_gray",
"looks_like": "t_carpet_red",
"symbol": ".",
"color": "red",
Expand Down Expand Up @@ -1346,7 +1340,6 @@
"id": "t_carpet_linoleum_white_red",
"copy-from": "t_carpet_base_linoleum_white",
"name": "red carpet",
"alias": "t_carpet_linoleum_white",
"looks_like": "t_carpet_red",
"symbol": ".",
"color": "red",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@
{
"type": "terrain",
"id": "t_zebra",
"alias": [ "t_zebra_h", "t_zebra_v" ],
"name": "pedestrian crossing",
"connect_groups": [ "PAVEMENT", "PAVEMENT_ZEBRA" ],
"connects_to": "PAVEMENT_ZEBRA",
Expand Down
1 change: 0 additions & 1 deletion data/json/furniture_and_terrain/terrain-fungal.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
{
"type": "terrain",
"id": "t_fungus_wall",
"alias": [ "t_fungus_wall_h", "t_fungus_wall_v" ],
"name": "fungal wall",
"description": "Several thick, large tendrils of fungus perforate the wall here, piercing straight through it from the outside. Despite the apparent damage, the wall is still structurally sound.",
"symbol": "O",
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain-manufactured.json
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
"description": "A large wall-mounted panel, covered with fragile metal sheets that regulate airflow.",
"symbol": "=",
"color": "light_gray",
"looks_like": "t_chainfence_v",
"looks_like": "t_chainfence",
"move_cost": 0,
"coverage": 90,
"connect_groups": "WALL",
Expand Down
Loading

0 comments on commit 9f98a02

Please sign in to comment.