Remove guaranteed residential solar, add random residential solar #75227

Maleclypse · 2024-07-25T05:21:41Z

Summary

Balance "Remove guaranteed residential solar, add random residential solar"

Purpose of change

Some house designs had guaranteed solar panels on the roof. No more. Adjust solar panel installations to Massachusetts ratio.

Describe the solution

I went and looked up the total number of single family homes in MA and then looked up the total number of residential solar installations in MA. 1,515,125 vs 177,143 This comes to 11.7%. Since the game covers all of New England and I didn't want to do weights in fractions of a percent I averaged most houses to have an 11% chance of spawning a solar panel nest. I also removed all guaranteed solar panel spawns on housetops.

Describe alternatives you've considered

Nope

Testing

Additional context

github-actions

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

[JSON & C++ formatters](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/DEVELOPER_TOOLING.md)

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house01.json

Lines 144 to 149 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house02.json

Lines 130 to 135 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house03.json

Lines 127 to 132 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house04.json

Lines 94 to 99 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house08.json

Lines 171 to 176 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house09.json

Lines 81 to 86 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house10.json

Lines 80 to 85 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house11.json

Lines 89 to 94 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house12.json

Lines 77 to 82 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house13.json

Lines 82 to 87 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house14.json

Lines 85 to 90 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house15.json

Lines 79 to 84 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house16.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house17.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house18.json

Lines 78 to 83 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house19.json

Lines 81 to 86 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house20.json

Lines 124 to 129 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house21.json

Lines 83 to 88 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house22.json

Lines 159 to 164 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house23.json

Lines 95 to 100 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house24.json

Lines 263 to 268 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house25.json

Lines 148 to 153 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house26.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house27.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house28.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house29.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house30.json

Lines 76 to 81 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house31.json

Lines 85 to 90 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house32.json

Lines 84 to 89 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house33.json

Lines 101 to 106 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house34.json

Lines 99 to 104 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house35.json

Lines 97 to 102 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house36.json

Lines 101 to 106 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house37.json

Lines 100 to 105 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house38.json

Lines 102 to 107 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house39.json

Lines 97 to 102 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house40.json

Lines 88 to 93 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house42.json

Lines 97 to 102 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_2story.json

Lines 141 to 146 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched1.json

Lines 122 to 127 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched10.json

Lines 122 to 127 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched2.json

Lines 110 to 115 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched3.json

Lines 103 to 108 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched4.json

Lines 192 to 197 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched5.json

Lines 119 to 124 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched6.json

Lines 118 to 123 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched7.json

Lines 112 to 117 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched8.json

Lines 108 to 116 in f972817

    
           "nested": { 
        
             "1": { 
        
               "chunks": [ 
        
                 [ "residential_1x2_solar", 6 ], 
        
                 [ "residential_2x2_solar", 4 ], 
        
                 [ "null", 88 ] 
        
               ] 
        
             } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched9.json

Lines 117 to 122 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence01.json

Lines 232 to 237 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence02.json

Lines 151 to 156 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence03.json

Lines 131 to 136 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence04.json

Lines 230 to 235 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence05.json

Lines 178 to 183 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage.json

Lines 93 to 98 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage2.json

Lines 102 to 107 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage3.json

Lines 94 to 99 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage4.json

Lines 90 to 95 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage5.json

Lines 86 to 91 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage6.json

Lines 122 to 127 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage7.json

Lines 100 to 105 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage8.json

Lines 115 to 120 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage_prepper.json

Lines 159 to 164 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_gardener.json

Lines 89 to 94 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_inner_garden.json

Lines 123 to 128 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_modern_lx.json

Lines 101 to 106 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_patio.json

Lines 119 to 124 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_porch.json

Lines 98 to 103 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_rv.json

Lines 87 to 92 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_suicide.json

Lines 161 to 166 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_tool_shed.json

Lines 99 to 104 in f972817

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 539 to 542 in f972817

    
           "object": { 
        
             "mapgensize": [ 2, 2 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": [ 0, 1 ], "y": [ 0, 1 ] } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 548 to 551 in f972817

    
           "object": { 
        
             "mapgensize": [ 1, 2 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 557 to 560 in f972817

    
           "object": { 
        
             "mapgensize": [ 1, 3 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 2 ] } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 566 to 569 in f972817

    
           "object": { 
        
             "mapgensize": [ 3, 3 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": [ 0, 2 ], "y": [ 0, 2 ] } 
        
           }

github-actions

Remaining comments which cannot be posted as a review comment to avoid GitHub Rate Limit

[JSON & C++ formatters](https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/DEVELOPER_TOOLING.md)

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house34.json

Lines 99 to 104 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house35.json

Lines 97 to 102 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house36.json

Lines 101 to 106 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house37.json

Lines 100 to 105 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house38.json

Lines 102 to 107 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house39.json

Lines 97 to 102 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house40.json

Lines 88 to 93 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house42.json

Lines 97 to 102 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_2story.json

Lines 141 to 146 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched1.json

Lines 122 to 127 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched10.json

Lines 122 to 127 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched2.json

Lines 110 to 115 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched3.json

Lines 103 to 108 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched4.json

Lines 192 to 197 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched5.json

Lines 119 to 124 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched6.json

Lines 118 to 123 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched7.json

Lines 112 to 117 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched8.json

Lines 108 to 116 in bad6637

    
           "nested": { 
        
             "1": { 
        
               "chunks": [ 
        
                 [ "residential_1x2_solar", 6 ], 
        
                 [ "residential_2x2_solar", 4 ], 
        
                 [ "null", 88 ] 
        
               ] 
        
             } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_detatched9.json

Lines 117 to 122 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence01.json

Lines 232 to 237 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence02.json

Lines 151 to 156 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence03.json

Lines 131 to 136 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence04.json

Lines 230 to 235 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_fence05.json

Lines 178 to 183 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage.json

Lines 93 to 98 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage2.json

Lines 102 to 107 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage3.json

Lines 94 to 99 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage4.json

Lines 90 to 95 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage5.json

Lines 86 to 91 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage6.json

Lines 122 to 127 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage7.json

Lines 100 to 105 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage8.json

Lines 115 to 120 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_garage_prepper.json

Lines 159 to 164 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_gardener.json

Lines 89 to 94 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_inner_garden.json

Lines 123 to 128 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_modern_lx.json

Lines 101 to 106 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_patio.json

Lines 119 to 124 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_porch.json

Lines 98 to 103 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_rv.json

Lines 87 to 92 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_suicide.json

Lines 161 to 166 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/house/house_tool_shed.json

Lines 99 to 104 in bad6637

    
           "chunks": [ 
        
             [ "residential_1x2_solar", 6 ], 
        
             [ "residential_2x2_solar", 2 ], 
        
             [ "residential_1x3_solar", 3 ], 
        
             [ "null", 88 ] 
        
           ]

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 539 to 542 in bad6637

    
           "object": { 
        
             "mapgensize": [ 2, 2 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": [ 0, 1 ], "y": [ 0, 1 ] } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 548 to 551 in bad6637

    
           "object": { 
        
             "mapgensize": [ 1, 2 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 1 ] } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 557 to 560 in bad6637

    
           "object": { 
        
             "mapgensize": [ 1, 3 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": 0, "y": [ 0, 2 ] } 
        
           }

[JSON & C++ formatters] _{reported by reviewdog 🐶}

Cataclysm-DDA/data/json/mapgen/nested/nested_chunks_roof.json

Lines 566 to 569 in bad6637

    
           "object": { 
        
             "mapgensize": [ 3, 3 ], 
        
             "place_furniture": { "furn": "f_solar_unit", "x": [ 0, 2 ], "y": [ 0, 2 ] } 
        
           }

GuardianDll · 2024-07-25T09:54:13Z

is there a reason 3x3 solar is used exactly once?
is there a reason to make [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] 100 times, instead of making a single nest with it
and, lastly, is there a reason to not put it in the roof_palette instead of adding it manually?

i'll fix it, because i feel it would be better this way

UPD: only the first question is what i would like to know, if possible

Maleclypse · 2024-07-25T14:15:59Z

is there a reason 3x3 solar is used exactly once? is there a reason to make [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] 100 times, instead of making a single nest with it and, lastly, is there a reason to not put it in the roof_palette instead of adding it manually?

i'll fix it, because i feel it would be better this way

UPD: only the first question is what i would like to know, if possible

So the 3x3 is replacing a 3x3 spawn on exactly one fairly large house. I was expecting there to be multiple houses with 3x3 spawns when going through but only found one and a 4x3 that really didn't seem to fit the size of the house. The answer to the rest of your questions is "I often stop looking for better ways to do a thing once I've found a way to do it, because this is how I avoid getting locked in decision paralysis of weighing the options." :) Thank you for improving this.

edit: I knew there would be more missing Ms in mapgen and they may need additional nests placed but I'll take care of hunting that down.

ehughsbaird · 2024-07-25T19:17:27Z

I looked at this a while ago and got some different stats, from https://www.eia.gov/todayinenergy/detail.php?id=54379

4.7% of Northeast homes have solar
2.5% of commercial buildings

But the reason I was looking at it was because the monocrystalline solar panels (solar_panel_v2) only spawn one place in game, on a car. So I found some stats on the production of those year by year and found that if the solar added by year matched the ratios of monocrystalline/polycrystalline production (and assuming solar from before stats start is negligible), there'd be about 34% monocrystalline panels by power production (but it takes more polycrystalline panels to produce the same amount as a monocrystalline panel, but the stats are for production of panels, so...).

Year	Solar Added (MW)	Monosilicon (%)	Added Monosilicon (MW)
2011	42.65	25	10.66
2012	134.5	25	33.63
2013	226.94	25	56.74
2014	269.11	25	67.28
2015	286.53	25	71.63
2016	394	25	98.5
2017	571	35	199.85
2018	370	45	166.5
2019	237	65	154.05
Total	2531.73	-	858.83

858.83/2531.73 = 34% high-efficiency monosilicon panels

Production Percent from https://www.ise.fraunhofer.de/content/dam/ise/de/documents/publications/studies/Photovoltaics-Report.pdf
Solar Added from https://www.mass.gov/info-details/renewable-energy-snapshot#installed-solar-capacity-in-massachusetts-

It's obviously not great data and I don't won't to add more work to you, but if you're interested it seems like it could fit in this PR.

Maleclypse · 2024-07-25T21:46:13Z

I looked at this a while ago and got some different stats, from https://www.eia.gov/todayinenergy/detail.php?id=54379
* 4.7% of Northeast homes have solar

* 2.5% of commercial buildings
But the reason I was looking at it was because the monocrystalline solar panels (solar_panel_v2) only spawn one place in game, on a car. So I found some stats on the production of those year by year and found that if the solar added by year matched the ratios of monocrystalline/polycrystalline production (and assuming solar from before stats start is negligible), there'd be about 34% monocrystalline panels by power production (but it takes more polycrystalline panels to produce the same amount as a monocrystalline panel, but the stats are for production of panels, so...).
Year Solar Added (MW) Monosilicon (%) Added Monosilicon (MW)
2011 42.65 25 10.66
2012 134.5 25 33.63
2013 226.94 25 56.74
2014 269.11 25 67.28
2015 286.53 25 71.63
2016 394 25 98.5
2017 571 35 199.85
2018 370 45 166.5
2019 237 65 154.05
Total 2531.73 - 858.83

858.83/2531.73 = 34% high-efficiency monosilicon panels

Production Percent from https://www.ise.fraunhofer.de/content/dam/ise/de/documents/publications/studies/Photovoltaics-Report.pdf Solar Added from https://www.mass.gov/info-details/renewable-energy-snapshot#installed-solar-capacity-in-massachusetts-

It's obviously not great data and I don't won't to add more work to you, but if you're interested it seems like it could fit in this PR.

I'm guessing part of the difference in percentages comes from multi unit homes vs single unit homes. Since in MA single family homes are about 1/2 57% per https://framinghamsource.com/index.php/2022/01/16/57-2-of-massachusetts-homes-are-single-family-2nd-lowest-in-u-s/ the number of multi unit homes and there are few incentives for renters or landlords to add solar to a multifamily I think my math meshes with your math. I'd have to create an advanced solar furniture which would be scope creep for this PR but definitely is something to consider for a followup. This is already touching too many files in my opinion to add a different set of files to look at as well. :)

Edit: your source had 100k installations in 2020 and mine had 178k in I think 2023 I'll look back if you think I should shrink the chances in the nest?

data/json/mapgen_palettes/roof_palette.json

data/json/mapgen/nested/nested_chunks_roof.json

data/json/mapgen_palettes/roof_palette.json

data/json/mapgen/irradiator_1.json

data/json/mapgen/shelter.json

data/json/mapgen/zoo.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Game: Balance Balancing of (existing) in-game features. labels Jul 25, 2024

github-actions bot reviewed Jul 25, 2024

View reviewed changes

github-actions bot added the astyled astyled PR, label is assigned by github actions label Jul 25, 2024

github-actions bot reviewed Jul 25, 2024

View reviewed changes

github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jul 25, 2024

Maleclypse commented Jul 25, 2024

View reviewed changes

data/json/mapgen_palettes/roof_palette.json Show resolved Hide resolved

Maleclypse commented Jul 25, 2024

View reviewed changes

data/json/mapgen_palettes/roof_palette.json Outdated Show resolved Hide resolved

github-actions bot added json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Jul 25, 2024