Skip to content

Commit

Permalink
Remove guaranteed residential solar, add random residential solar
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maleclypse
Maleclypse committed Jul 25, 2024
1 parent 8ffc091 commit f972817
Show file tree
Hide file tree
Showing 103 changed files with 1,253 additions and 212 deletions.
14 changes: 12 additions & 2 deletions data/json/mapgen/house/2storymodern01.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@
" -.................- ",
" -...N.............- ",
" -.................- ",
" -----.............- ",
" -----....1........- ",
" -............-- ",
" -............5 ",
" -.......~....- ",
Expand All @@ -545,7 +545,17 @@
" "
],
"terrain": { ".": "t_shingle_flat_roof" },
"rotation": [ 2 ]
"rotation": [ 2 ],
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/2storymodern02.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
" --....-- -.......- ",
" -......-------.......- ",
" -.................=..- ",
" -....................- ",
" -....1...............- ",
" -...................-- ",
" -............-------- ",
" -............- ",
Expand All @@ -185,7 +185,17 @@
" ",
" "
],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/2storymodern03.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
" ------------......-- ",
" -...........=.....- ",
" -.A...............- ",
" -.................- ",
" -........1........- ",
" --.....N.......&..- ",
" ------...........- ",
" -----..------ ",
Expand All @@ -176,7 +176,17 @@
" ",
" ",
" "
]
],
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
18 changes: 14 additions & 4 deletions data/json/mapgen/house/2storymodern04.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,9 @@
" -......................- ",
" -......................- ",
" -.................X....- ",
" -...MMMM...............- ",
" -...MMMM...............- ",
" -...MMMM...............- ",
" -...1..................- ",
" -......................- ",
" -......................- ",
" -......................- ",
" -..............ooooo...- ",
" -..............ooooo...- ",
Expand All @@ -201,7 +201,17 @@
" ------------ ",
" ",
" "
]
],
"nested": {
"1": {
"chunks": [
[ "residential_3x3_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow01.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"`-.........-----------``",
"`-...................-``",
"`-...................-``",
"`-...................-``",
"`-.....1.............-``",
"`-...................-``",
"`-...................-``",
"`-................X..-``",
Expand All @@ -88,7 +88,17 @@
"`---------------------``",
"````````````````````````"
],
"terrain": { ".": "t_shingle_flat_roof", "`": "t_open_air" }
"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 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow02.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
" -..........=.......- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -..........1.......- ",
" --------...........- ",
" -...........- ",
" -........X..- ",
Expand All @@ -99,7 +99,17 @@
" 5------------ ",
" "
],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow03.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
" -------------------- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -.......1..........- ",
" -..................- ",
" -..................- ",
" -..N...............- ",
Expand All @@ -85,7 +85,17 @@
" -..................- ",
" -------------------- ",
" "
]
],
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow04.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,23 @@
" -...............- ",
" -------.........----- ",
" 5.............- ",
" -.............- ",
" -....1........- ",
" -.............- ",
" -.............- ",
" -.............- ",
" --------------- ",
" "
]
],
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow05.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" -.......- ",
" -------.......- ",
" -.............- ",
" -.............- ",
" -.......1.....- ",
" -.............- ",
" -.............- ",
" -.............- ",
Expand All @@ -90,7 +90,17 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow06.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
" ------------.......- ",
" --..................- ",
" -...................- ",
" -...................- ",
" -.........1.........- ",
" -...................- ",
" -...................- ",
" --...=..............- ",
Expand All @@ -90,7 +90,17 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow07.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
" -......- ",
" -------......------- ",
" -..................- ",
" -..................- ",
" -...........1......- ",
" -..................- ",
" -...N..............- ",
" -..................- ",
Expand All @@ -79,7 +79,17 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow08.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
" ------------.......- ",
" -..................- ",
" -..................- ",
" -..................- ",
" -......1...........- ",
" -..................- ",
" -..................- ",
" -..................- ",
Expand All @@ -86,7 +86,17 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
16 changes: 13 additions & 3 deletions data/json/mapgen/house/bungalow09.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
" -..................- ",
" -...N..............- ",
" -..................- ",
" -.............MMMM.- ",
" -.............MMMM.- ",
" -............1.....- ",
" -..................- ",
" -..................- ",
" -..................- ",
" 5..................5 ",
Expand All @@ -87,7 +87,17 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
14 changes: 12 additions & 2 deletions data/json/mapgen/house/bungalow10.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
" -....................- ",
" -....................- ",
" -....................- ",
" -....................- ",
" -..........1.........- ",
" -....................5 ",
" -....................- ",
" -...X................- ",
Expand All @@ -85,7 +85,17 @@
" "
],
"palettes": [ "roof_palette" ],
"terrain": { ".": "t_shingle_flat_roof" }
"terrain": { ".": "t_shingle_flat_roof" },
"nested": {
"1": {
"chunks": [
[ "residential_1x2_solar", 6 ],
[ "residential_2x2_solar", 2 ],
[ "residential_1x3_solar", 3 ],
[ "null", 88 ]
]
}
}
}
}
]
Loading

0 comments on commit f972817

Please sign in to comment.