Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove guaranteed residential solar, add random residential solar #75227

Merged
merged 21 commits into from
Jul 29, 2024
Merged

Remove guaranteed residential solar, add random residential solar #75227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7c586f8
Remove guaranteed residential solar, add random residential solar
Maleclypse Jul 25, 2024
e01a5b0
Apply suggestions from code review
Maleclypse Jul 25, 2024
44db4b5
Lint
GuardianDll Jul 25, 2024
74bc948
fix irradiator and ice cream palette
GuardianDll Jul 25, 2024
531da82
move the most popular chunk variation into the palette definition
GuardianDll Jul 25, 2024
4ca4c4f
do not intersect the single unique nest with palette nest
GuardianDll Jul 25, 2024
dd05337
more fixes
GuardianDll Jul 25, 2024
3ce3b59
more fixes
GuardianDll Jul 25, 2024
c545c8f
replace lmoe_solar with nest
GuardianDll Jul 25, 2024
c3e09bd
fix nest placed out of bounds of OMT
GuardianDll Jul 25, 2024
f28b5ea
Update data/json/mapgen_palettes/roof_palette.json
Maleclypse Jul 25, 2024
9973ace
Fixes
Maleclypse Jul 25, 2024
42060e2
Update data/json/mapgen_palettes/roof_palette.json
Maleclypse Jul 25, 2024
394f7d5
Update data/json/mapgen_palettes/roof_palette.json
Maleclypse Jul 25, 2024
324a832
Apply suggestions from code review
Maleclypse Jul 26, 2024
bd2c05c
Update nested_chunks_roof.json
Maleclypse Jul 26, 2024
b6cfa44
Update data/json/mapgen/nested/nested_chunks_roof.json
Maleclypse Jul 26, 2024
e038da2
Update nested_chunks_roof.json
Maleclypse Jul 26, 2024
f9ee6f7
Update data/json/mapgen_palettes/roof_palette.json
Maleclypse Jul 26, 2024
7b2ad2a
Apply suggestions from code review
Maleclypse Jul 26, 2024
ed431b9
Update house43.json
Maleclypse Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/json/mapgen/dive_shop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"-.....................- ",
"-..............ooo..Я.- ",
"-....A.........ooo..Я.- ",
"-....MM........ooo....- ",
"-....1.........ooo....- ",
"-..................&..- ",
"-.....................- ",
"-5--------------------- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/2storymodern01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@
" -.................- ",
" -...N.............- ",
" -.................- ",
" -----.............- ",
" -----....1........- ",
" -............-- ",
" -............5 ",
" -.......~....- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/2storymodern02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
" --....-- -.......- ",
" -......-------.......- ",
" -.................=..- ",
" -....................- ",
" -....1...............- ",
" -...................-- ",
" -............-------- ",
" -............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/2storymodern03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
" ------------......-- ",
" -...........=.....- ",
" -.A...............- ",
" -.................- ",
" -........1........- ",
" --.....N.......&..- ",
" ------...........- ",
" -----..------ ",
Expand Down
13 changes: 9 additions & 4 deletions data/json/mapgen/house/2storymodern04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@
" -......................- ",
" -......................- ",
" -.................X....- ",
" -...MMMM...............- ",
" -...MMMM...............- ",
" -...MMMM...............- ",
" -...2..................- ",
" -......................- ",
" -......................- ",
" -......................- ",
" -..............ooooo...- ",
" -..............ooooo...- ",
Expand All @@ -201,7 +201,12 @@
" ------------ ",
" ",
" "
]
],
"nested": {
"2": {
"chunks": [ [ "residential_3x3_solar", 6 ], [ "residential_2x2_solar", 2 ], [ "residential_1x3_solar", 3 ], [ "null", 88 ] ]
}
}
}
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"`-.........-----------``",
"`-...................-``",
"`-...................-``",
"`-...................-``",
"`-.....1.............-``",
"`-...................-``",
"`-...................-``",
"`-................X..-``",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
" -..........=.......- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -..........1.......- ",
" --------...........- ",
" -...........- ",
" -........X..- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
" -------------------- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -.......1..........- ",
" -..................- ",
" -..................- ",
" -..N...............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
" -...............- ",
" -------.........----- ",
" 5.............- ",
" -.............- ",
" -....1........- ",
" -.............- ",
" -.............- ",
" -.............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow05.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" -.......- ",
" -------.......- ",
" -.............- ",
" -.............- ",
" -.......1.....- ",
" -.............- ",
" -.............- ",
" -.............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow06.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
" ------------.......- ",
" --..................- ",
" -...................- ",
" -...................- ",
" -.........1.........- ",
" -...................- ",
" -...................- ",
" --...=..............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow07.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
" -......- ",
" -------......------- ",
" -..................- ",
" -..................- ",
" -...........1......- ",
" -..................- ",
" -...N..............- ",
" -..................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow08.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
" ------------.......- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -......1...........- ",
" -..................- ",
" -..................- ",
" -..................- ",
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/house/bungalow09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
" -..................- ",
" -...N..............- ",
" -..................- ",
" -.............MMMM.- ",
" -.............MMMM.- ",
" -............1.....- ",
" -..................- ",
" -..................- ",
" -..................- ",
" 5..................5 ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" -....................- ",
" -....................- ",
" -....................- ",
" -....................- ",
" -..........1.........- ",
" -....................5 ",
" -....................- ",
" -...X................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
" -.................- ",
" -.................- ",
" -.................5 ",
" -.................- ",
" -.......1.........- ",
" -.................- ",
" -.................- ",
" 5.................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
" -...................- ",
" -...................- ",
" -...................- ",
" -...................- ",
" -.......1...........- ",
" -...................- ",
" 5..................-- ",
" -..................5 ",
Expand Down
7 changes: 3 additions & 4 deletions data/json/mapgen/house/bungalow13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@
" -....................- ",
" -....................- ",
" -....................- ",
" -.............1......- ",
" -....................- ",
" -....................- ",
" -.A...............M..- ",
" -.A..................- ",
" -........=...........- ",
" -....................- ",
" 5....................- ",
Expand All @@ -112,8 +112,7 @@
"=": "t_shingle_flat_roof",
"A": "t_shingle_flat_roof",
"~": "t_shingle_flat_roof"
},
"furniture": { "M": "f_solar_unit" }
}
}
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
" 5....................- ",
" -.....=..............- ",
" -....................- ",
" -....................- ",
" -............1.......- ",
" -....................- ",
" -....................- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow15.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
" -...............- ",
" -...............5 ",
" -...............- ",
" -...............- ",
" -....1..........- ",
" -...............- ",
" .... -...........=...- ",
" .... -...............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
" -.X..................- ",
" -....................5 ",
" -....................- ",
" -....................- ",
" -............1.......- ",
" -....................- ",
" -....................- ",
" -....=...............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow17.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
" ---------------------- ",
" -....................- ",
" -....................- ",
" -....................- ",
" -............1.......- ",
" 5....................- ",
" -....................- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
" ",
" ---------------------- ",
" -....................- ",
" -....................- ",
" -..........1.........- ",
" -....................- ",
" 5....=...............- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow19.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
" ---...............~- ",
" -..................- ",
" -..................- ",
" -..................--- ",
" -.........1........--- ",
" -....................- ",
" -....................- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow20.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
" -....................- ",
" -....X...............- ",
" -....................- ",
" -...................-- ",
" -.............1.....-- ",
" -...................- ",
" 5...N...............- ",
" -...................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow21.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
" --------- ",
" -----------.......- ",
" -.................- ",
" -.................- ",
" -....1............- ",
" -.................- ",
" -.................- ",
" -.................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow22.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
" -......------------ ",
" -.................- ",
" -.................- ",
" -.................- ",
" -..........1......- ",
" -~................- ",
" -.................- ",
" -.................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow23.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
" -----...............- ",
" -...................- ",
" -...................- ",
" -...................- ",
" -....1..............- ",
" -...................- ",
" -...................- ",
" -...................- ",
Expand Down
11 changes: 5 additions & 6 deletions data/json/mapgen/house/bungalow24.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
" -...................- ",
" --...................- ",
" -....................- ",
" -..............YYY...- ",
" -..............YYY...- ",
" --.....X.......YYY...- ",
" -.............YYY...- ",
" -..............1.....- ",
" -....................- ",
" --.....X.............- ",
" -.............1.....- ",
" -...................- ",
" -...................- ",
" -...................- ",
Expand All @@ -93,8 +93,7 @@
" ------------ ",
" "
],
"terrain": { ".": "t_shingle_flat_roof" },
"furniture": { "Y": "f_solar_unit" }
"terrain": { ".": "t_shingle_flat_roof" }
}
}
]
2 changes: 1 addition & 1 deletion data/json/mapgen/house/bungalow25.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
" -...................- ",
" -...................- ",
" -....X..............- ",
" -...................- ",
" -.........1.........- ",
" -...................- ",
" -...................- ",
" -...............----- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/garden_house_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
" -.............- ",
" -.............- ",
" -.............- ",
" -.............- ",
" -.....1.......- ",
" -.............- ",
" -.............- ",
" -.............- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
" -.................- ",
" -.................- ",
" -.............N...- ",
" 5.................- ",
" 5.....1...........- ",
" -.................- ",
" -.................- ",
" -........&........- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house02.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
" -..................- ",
" -....=......N......- ",
" -..................- ",
" -..................- ",
" -........1.........- ",
" -..................- ",
" -..................- ",
" -..................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
" -..................- ",
" -..................- ",
" -...........&......- ",
" -..................- ",
" -...1..............- ",
" -..................- ",
" -..................- ",
" -.....--------.....- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house04.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
" -....................- ",
" -....................- ",
" -....................- ",
" -....................- ",
" -.....1..............- ",
" -....................- ",
" -....................- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house08.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
" 5..............:....- ",
" -...................- ",
" --...................- ",
" -....................- ",
" -........1...........- ",
" -....................- ",
" -....................- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house09.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
" -....X...............- ",
" -....................- ",
" -....................- ",
" -....................- ",
" -.........1..........- ",
" -....................- ",
" -....................- ",
" -....................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house10.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
" -........----------5 ",
" -..................- ",
" -..................- ",
" -..................- ",
" -......1...........- ",
" -..................- ",
" -..................- ",
" -..................- ",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/house/house11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
" -..................- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -....1.............- ",
" -..................- ",
" -.............&....- ",
" -..................- ",
Expand Down
Loading
Loading