Apply suggestions from code review

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Jul 25, 2024 · bad6637 · bad6637
1 parent f972817
commit bad6637
Show file tree

Hide file tree

Showing 30 changed files with 30 additions and 180 deletions.
diff --git a/data/json/mapgen/house/2storymodern01.json b/data/json/mapgen/house/2storymodern01.json
@@ -548,12 +548,7 @@
       "rotation": [ 2 ],
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/2storymodern02.json b/data/json/mapgen/house/2storymodern02.json
@@ -188,12 +188,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/2storymodern03.json b/data/json/mapgen/house/2storymodern03.json
@@ -179,12 +179,7 @@
       ],
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/2storymodern04.json b/data/json/mapgen/house/2storymodern04.json
@@ -204,12 +204,7 @@
       ],
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_3x3_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_3x3_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow01.json b/data/json/mapgen/house/bungalow01.json
@@ -91,12 +91,7 @@
       "terrain": { ".": "t_shingle_flat_roof", "`": "t_open_air" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow02.json b/data/json/mapgen/house/bungalow02.json
@@ -102,12 +102,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow03.json b/data/json/mapgen/house/bungalow03.json
@@ -88,12 +88,7 @@
       ],
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow04.json b/data/json/mapgen/house/bungalow04.json
@@ -107,12 +107,7 @@
       ],
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow05.json b/data/json/mapgen/house/bungalow05.json
@@ -93,12 +93,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow06.json b/data/json/mapgen/house/bungalow06.json
@@ -93,12 +93,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow07.json b/data/json/mapgen/house/bungalow07.json
@@ -82,12 +82,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow08.json b/data/json/mapgen/house/bungalow08.json
@@ -89,12 +89,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow09.json b/data/json/mapgen/house/bungalow09.json
@@ -90,12 +90,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow10.json b/data/json/mapgen/house/bungalow10.json
@@ -88,12 +88,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow11.json b/data/json/mapgen/house/bungalow11.json
@@ -99,12 +99,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow12.json b/data/json/mapgen/house/bungalow12.json
@@ -107,12 +107,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow13.json b/data/json/mapgen/house/bungalow13.json
@@ -115,12 +115,7 @@
       },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow14.json b/data/json/mapgen/house/bungalow14.json
@@ -131,12 +131,7 @@
       "terrain": { ".": "t_shingle_flat_roof", "=": "t_shingle_flat_roof", "N": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow15.json b/data/json/mapgen/house/bungalow15.json
@@ -105,12 +105,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow16.json b/data/json/mapgen/house/bungalow16.json
@@ -123,12 +123,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow17.json b/data/json/mapgen/house/bungalow17.json
@@ -86,12 +86,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow18.json b/data/json/mapgen/house/bungalow18.json
@@ -81,12 +81,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow19.json b/data/json/mapgen/house/bungalow19.json
@@ -112,12 +112,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow20.json b/data/json/mapgen/house/bungalow20.json
@@ -92,12 +92,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow21.json b/data/json/mapgen/house/bungalow21.json
@@ -95,12 +95,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow22.json b/data/json/mapgen/house/bungalow22.json
@@ -111,12 +111,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow23.json b/data/json/mapgen/house/bungalow23.json
@@ -107,12 +107,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }

diff --git a/data/json/mapgen/house/bungalow24.json b/data/json/mapgen/house/bungalow24.json
@@ -96,12 +96,7 @@
       "terrain": { ".": "t_shingle_flat_roof" },
       "nested": {
         "1": {
-          "chunks": [
-            [ "residential_1x2_solar", 6 ],
-            [ "residential_2x2_solar", 2 ],
-            [ "residential_1x3_solar", 3 ],
-            [ "null", 88 ]
-          ]
+          "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
         }
       }
     }