Skip to content

Commit

Permalink
Merge branch 'Solar-Roof-nest-for-houses' of https://github.com/Malec…
Browse files Browse the repository at this point in the history
…lypse/Cataclysm-DDA into Solar-Roof-nest-for-houses
  • Loading branch information
Maleclypse committed Jul 25, 2024
2 parents cde5b46 + afa729d commit aaa25f6
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions data/json/mapgen_palettes/roof_palette.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,8 @@
"1": {
"chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
},
"2": {
"chunks": [ [ "industrial_1x5_solar" ] ]
},
"2": { "chunks": [ [ "industrial_1x5_solar" ] ] },

Check failure on line 60 in data/json/mapgen_palettes/roof_palette.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

([slow] ~starting_items)=> Array had wrong number of elements for pair "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ] }, "2": { "chunks": [ [ "industrial_1x5_solar" ] ] }, ▲▲▲ "3": { "chunks": [ [ "industrial_1x1_solar" ] ] }, "5": { "chunks": [ [ "null", 90 ], [ "roof_1x1_birdnest", 10 ] ] },

Check failure on line 60 in data/json/mapgen_palettes/roof_palette.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

(~[slow] ~[.],starting_items)=> Array had wrong number of elements for pair "chunks": [ [ "residential_1x2_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ] }, "2": { "chunks": [ [ "industrial_1x5_solar" ] ] }, ▲▲▲ "3": { "chunks": [ [ "industrial_1x1_solar" ] ] }, "5": { "chunks": [ [ "null", 90 ], [ "roof_1x1_birdnest", 10 ] ] },
"3": { "chunks": [ [ "industrial_1x1_solar" ] ] },
"5": { "chunks": [ [ "null", 90 ], [ "roof_1x1_birdnest", 10 ] ] },
"-": { "chunks": [ [ "null", 1000 ], [ "roof_1x1_birdnest", 5 ] ] }
},
Expand Down

0 comments on commit aaa25f6

Please sign in to comment.