Skip to content

Commit 3e51e78

Browse files
GuardianDllGuardianDll
authored
Merge pull request CleverRaven#83188 from ShnitzelX2/rename-region-settings
Rename region settings C++/JSON, add new region settings docs
2 parents 6caac0d + 82fc436 commit 3e51e78

File tree

26 files changed

+458
-445
lines changed

26 files changed

+458
-445
lines changed

‎data/json/region_settings/region_settings/regional_map_settings.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_settings_new",
3+
"type": "region_settings",
44
"id": "default",
55
"rivers": "default",
66
"lakes": "default",
@@ -259,21 +259,21 @@
259259
"terrain_furniture": { "t_water_murky": { "chance": 2, "furniture": [ [ "f_region_water_plant", 1 ] ] } }
260260
},
261261
{
262-
"type": "forest_biome_feature",
262+
"type": "forest_biome_component",
263263
"id": "trees_forest",
264264
"sequence": 0,
265265
"chance": 12,
266266
"types": [ [ "t_region_tree_forest", 128 ], [ "t_tree_young", 32 ] ]
267267
},
268268
{
269-
"type": "forest_biome_feature",
269+
"type": "forest_biome_component",
270270
"id": "shrubs_and_flowers_forest",
271271
"sequence": 1,
272272
"chance": 10,
273273
"types": [ [ "t_region_shrub_forest", 120 ], [ "t_tree_young", 10 ] ]
274274
},
275275
{
276-
"type": "forest_biome_feature",
276+
"type": "forest_biome_component",
277277
"id": "clutter_forest",
278278
"sequence": 2,
279279
"chance": 80,
@@ -289,28 +289,28 @@
289289
]
290290
},
291291
{
292-
"type": "forest_biome_feature",
292+
"type": "forest_biome_component",
293293
"id": "water_forest",
294294
"sequence": 3,
295295
"chance": 512,
296296
"types": [ [ "t_puddle", 1 ] ]
297297
},
298298
{
299-
"type": "forest_biome_feature",
299+
"type": "forest_biome_component",
300300
"id": "trees_forest_thick",
301301
"copy-from": "trees_forest",
302302
"chance": 5,
303303
"types": [ [ "t_region_tree_forest_dense", 100 ], [ "t_tree_young", 5 ] ]
304304
},
305305
{
306-
"type": "forest_biome_feature",
306+
"type": "forest_biome_component",
307307
"id": "shrubs_and_flowers_forest_thick",
308308
"copy-from": "shrubs_and_flowers_forest",
309309
"chance": 5,
310310
"types": [ [ "t_region_shrub_forest_dense", 130 ], [ "t_tree_young", 10 ] ]
311311
},
312312
{
313-
"type": "forest_biome_feature",
313+
"type": "forest_biome_component",
314314
"id": "clutter_forest_thick",
315315
"copy-from": "clutter_forest",
316316
"chance": 64,
@@ -326,13 +326,13 @@
326326
]
327327
},
328328
{
329-
"type": "forest_biome_feature",
329+
"type": "forest_biome_component",
330330
"id": "water_forest_thick",
331331
"copy-from": "water_forest",
332332
"//": "for ease of mod copies"
333333
},
334334
{
335-
"type": "forest_biome_feature",
335+
"type": "forest_biome_component",
336336
"id": "trees_forest_water",
337337
"copy-from": "trees_forest",
338338
"chance": 45,
@@ -368,21 +368,21 @@
368368
]
369369
},
370370
{
371-
"type": "forest_biome_feature",
371+
"type": "forest_biome_component",
372372
"id": "shrubs_and_flowers_forest_water",
373373
"copy-from": "shrubs_and_flowers_forest",
374374
"chance": 15,
375375
"types": [ [ "t_region_shrub_swamp", 80 ], [ "f_region_forest_water", 30 ] ]
376376
},
377377
{
378-
"type": "forest_biome_feature",
378+
"type": "forest_biome_component",
379379
"id": "clutter_forest_water",
380380
"copy-from": "clutter_forest",
381381
"chance": 75,
382382
"types": [ [ "t_trunk", 1 ], [ "f_boulder_small", 2 ], [ "f_boulder_medium", 1 ] ]
383383
},
384384
{
385-
"type": "forest_biome_feature",
385+
"type": "forest_biome_component",
386386
"id": "water_forest_water",
387387
"copy-from": "water_forest",
388388
"chance": 2,

‎data/json/region_settings/region_settings/test_regional_map_settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_settings_new",
3+
"type": "region_settings",
44
"id": "test",
55
"rivers": "no_rivers",
66
"lakes": "no_lakes",

‎data/mods/Backrooms/region_settings/region_settings/regional_map_settings.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -157,26 +157,26 @@
157157
"terrain_furniture": { }
158158
},
159159
{
160-
"type": "forest_biome_feature",
160+
"type": "forest_biome_component",
161161
"id": "trees_forest_backrooms",
162162
"copy-from": "trees_forest",
163163
"chance": 6,
164164
"types": [ [ "t_wall", 128 ] ]
165165
},
166166
{
167-
"type": "forest_biome_feature",
167+
"type": "forest_biome_component",
168168
"id": "shrubs_and_flowers_forest_backrooms",
169169
"copy-from": "shrubs_and_flowers_forest",
170170
"types": [ [ "f_rack_coat", 1 ], [ "f_sign_warning", 1 ], [ "f_sign", 1 ] ]
171171
},
172172
{
173-
"type": "forest_biome_feature",
173+
"type": "forest_biome_component",
174174
"id": "clutter_forest_backrooms",
175175
"copy-from": "clutter_forest",
176176
"types": [ [ "t_wall_b", 128 ], [ "t_wall", 128 ], [ "t_carpet_red", 128 ] ]
177177
},
178178
{
179-
"type": "forest_biome_feature",
179+
"type": "forest_biome_component",
180180
"id": "water_forest_backrooms",
181181
"copy-from": "water_forest",
182182
"types": [ [ "t_thconc_floor", 1 ] ]
@@ -199,25 +199,25 @@
199199
"terrain_furniture": { }
200200
},
201201
{
202-
"type": "forest_biome_feature",
202+
"type": "forest_biome_component",
203203
"id": "trees_forest_thick_backrooms",
204204
"copy-from": "trees_forest_thick",
205205
"types": [ [ "t_wall_b", 128 ], [ "t_wall", 128 ], [ "t_carpet_red", 128 ], [ "t_thconc_floor_olight", 20 ] ]
206206
},
207207
{
208-
"type": "forest_biome_feature",
208+
"type": "forest_biome_component",
209209
"id": "shrubs_and_flowers_forest_thick_backrooms",
210210
"copy-from": "shrubs_and_flowers_forest_thick",
211211
"types": [ [ "f_rack_coat", 1 ], [ "f_sign_warning", 1 ], [ "f_sign", 1 ] ]
212212
},
213213
{
214-
"type": "forest_biome_feature",
214+
"type": "forest_biome_component",
215215
"id": "clutter_forest_thick_backrooms",
216216
"copy-from": "clutter_forest_thick",
217217
"types": [ [ "t_scrap_floor", 64 ], [ "t_dirtfloor", 64 ] ]
218218
},
219219
{
220-
"type": "forest_biome_feature",
220+
"type": "forest_biome_component",
221221
"id": "water_forest_thick_backrooms",
222222
"copy-from": "water_forest_thick",
223223
"types": [ [ "t_carpet_green", 1 ] ]
@@ -240,26 +240,26 @@
240240
"terrain_furniture": { "t_water_sh": { "chance": 1, "furniture": { "f_sign_warning": 5 } } }
241241
},
242242
{
243-
"type": "forest_biome_feature",
243+
"type": "forest_biome_component",
244244
"id": "trees_forest_water_backrooms",
245245
"copy-from": "trees_forest_water",
246246
"chance": 5,
247247
"types": [ [ "t_utility_light", 30 ] ]
248248
},
249249
{
250-
"type": "forest_biome_feature",
250+
"type": "forest_biome_component",
251251
"id": "shrubs_and_flowers_forest_water_backrooms",
252252
"copy-from": "shrubs_and_flowers_forest_water",
253253
"types": [ [ "t_floor_wax", 1 ] ]
254254
},
255255
{
256-
"type": "forest_biome_feature",
256+
"type": "forest_biome_component",
257257
"id": "clutter_forest_water_backrooms",
258258
"copy-from": "clutter_forest_water",
259259
"types": [ [ "t_linoleum_gray", 1 ] ]
260260
},
261261
{
262-
"type": "forest_biome_feature",
262+
"type": "forest_biome_component",
263263
"id": "water_forest_water_backrooms",
264264
"copy-from": "water_forest_water",
265265
"types": [ [ "t_junk_floor", 6 ] ]
@@ -271,7 +271,7 @@
271271
"biomes": [ "biome_forest_backrooms", "biome_forest_thick_backrooms", "biome_forest_water_backrooms" ]
272272
},
273273
{
274-
"type": "region_settings_new",
274+
"type": "region_settings",
275275
"id": "default_backrooms",
276276
"copy-from": "default",
277277
"rivers": "no_rivers",

‎data/mods/CrazyCataclysm/crazy_mapgen.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"autonote": true
3333
},
3434
{
35-
"type": "region_overlay_new",
35+
"type": "region_overlay",
3636
"id": "default_crazy",
3737
"apply_to_tags": [ "all" ],
3838
"map_extras": "default_crazy"

‎data/mods/Defense_Mode/region_overlay.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_overlay_new",
3+
"type": "region_overlay",
44
"apply_to_tags": [ "all" ],
55
"id": "default_defense_mode",
66
"feature_flag_settings": { "whitelist": [ "DEFENSE_MODE" ] }

‎data/mods/DinoMod/regional_overlay.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_overlay_new",
3+
"type": "region_overlay",
44
"id": "default_dinomod",
55
"apply_to_tags": [ "all" ],
66
"map_extras": "default_dinomod",

‎data/mods/Isolation-Protocol/region_settings/region_settings/region_settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_settings_new",
3+
"type": "region_settings",
44
"id": "default_isolation",
55
"copy-from": "default",
66
"rivers": "no_rivers",

‎data/mods/Magiclysm/worldgen/regional_overlay.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_overlay_new",
3+
"type": "region_overlay",
44
"id": "default_magiclysm",
55
"apply_to_tags": [ "all" ],
66
"cities": "default_magiclysm",

‎data/mods/MindOverMatter/overmap/regional_overlay.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_overlay_new",
3+
"type": "region_overlay",
44
"id": "default_mindovermatter",
55
"apply_to_tags": [ "all" ],
66
"cities": "default_mindovermatter",

‎data/mods/No_Hope/region_overlay.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"type": "region_settings_new",
3+
"type": "region_settings",
44
"id": "default_nohope",
55
"copy-from": "default",
66
"map_extras": "default_nohope",

0 commit comments

Comments
 (0)