Skip to content

Commit b3ea779

Browse files
MaleclypseMaleclypse
authored
Merge pull request CleverRaven#83237 from ehughsbaird/its-easy-if-you-try
Move more external options to region settings
2 parents c7d0c49 + b5a6843 commit b3ea779

File tree

22 files changed

+204
-268
lines changed

22 files changed

+204
-268
lines changed

‎data/core/external_options.json‎

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -307,118 +307,6 @@
307307
"stype": "string_input",
308308
"value": ""
309309
},
310-
{
311-
"type": "EXTERNAL_OPTION",
312-
"name": "OVERMAP_POPULATE_OUTSIDE_CONNECTIONS_FROM_NEIGHBORS",
313-
"//": "Allows to populate outside connections from neighbors.",
314-
"stype": "bool",
315-
"value": true
316-
},
317-
{
318-
"type": "EXTERNAL_OPTION",
319-
"name": "OVERMAP_FOREST_INCREASE_NORTH",
320-
"//": "Rate at which forest coverage of the map increases to the North, based on regional map settings thresholds. 0=no increase.",
321-
"stype": "float",
322-
"value": 0.04
323-
},
324-
{
325-
"type": "EXTERNAL_OPTION",
326-
"name": "OVERMAP_FOREST_INCREASE_EAST",
327-
"//": "Rate at which forest coverage of the map increases to the East. 0=no increase.",
328-
"stype": "float",
329-
"value": 0
330-
},
331-
{
332-
"type": "EXTERNAL_OPTION",
333-
"name": "OVERMAP_FOREST_INCREASE_WEST",
334-
"//": "Rate at which forest coverage of the map increases to the West. 0=no increase.",
335-
"stype": "float",
336-
"value": 0.02
337-
},
338-
{
339-
"type": "EXTERNAL_OPTION",
340-
"name": "OVERMAP_FOREST_INCREASE_SOUTH",
341-
"//": "Rate at which forest coverage of the map increases to the South. 0=no increase.",
342-
"stype": "float",
343-
"value": 0
344-
},
345-
{
346-
"type": "EXTERNAL_OPTION",
347-
"name": "OVERMAP_FOREST_LIMIT",
348-
"//": "Caps how high the forest threshold can rise. No cities form at values over 0.4",
349-
"stype": "float",
350-
"value": 0.395
351-
},
352-
{
353-
"type": "EXTERNAL_OPTION",
354-
"name": "OVERMAP_PLACE_SWAMPS",
355-
"//": "Allows to place procgen swamps during overmap generation.",
356-
"stype": "bool",
357-
"value": true
358-
},
359-
{
360-
"type": "EXTERNAL_OPTION",
361-
"name": "OVERMAP_PLACE_ROADS",
362-
"//": "Allows to place procgen roads during overmap generation.",
363-
"stype": "bool",
364-
"value": true
365-
},
366-
{
367-
"type": "EXTERNAL_OPTION",
368-
"name": "OVERMAP_PLACE_RAILROADS",
369-
"//": "Allows to place procgen railroads during overmap generation.",
370-
"stype": "bool",
371-
"value": false
372-
},
373-
{
374-
"type": "EXTERNAL_OPTION",
375-
"name": "OVERMAP_PLACE_RAILROADS_BEFORE_ROADS",
376-
"//": "Defines whether to place railroads before roads.",
377-
"stype": "bool",
378-
"value": false
379-
},
380-
{
381-
"type": "EXTERNAL_OPTION",
382-
"name": "OVERMAP_PLACE_SPECIALS",
383-
"//": "Allows to place overmap specials during overmap generation.",
384-
"stype": "bool",
385-
"value": true
386-
},
387-
{
388-
"type": "EXTERNAL_OPTION",
389-
"name": "OVERMAP_URBAN_INCREASE_NORTH",
390-
"//": "Rate at which urbanity of the map increases to the North. 0=no increase. Negative numbers are technically allowed but may cause weird effects.",
391-
"stype": "int",
392-
"value": 0
393-
},
394-
{
395-
"type": "EXTERNAL_OPTION",
396-
"name": "OVERMAP_URBAN_INCREASE_EAST",
397-
"//": "Rate at which urbanity of the map increases to the East. 0=no increase.",
398-
"stype": "int",
399-
"value": 10
400-
},
401-
{
402-
"type": "EXTERNAL_OPTION",
403-
"name": "OVERMAP_URBAN_INCREASE_WEST",
404-
"//": "Rate at which urbanity of the map increases to the South. 0=no increase.",
405-
"stype": "int",
406-
"value": 0
407-
},
408-
{
409-
"type": "EXTERNAL_OPTION",
410-
"name": "OVERMAP_URBAN_INCREASE_SOUTH",
411-
"//": "Rate at which urbanity of the map increases to the West. 0=no increase.",
412-
"stype": "int",
413-
"value": 5
414-
},
415-
{
416-
"type": "EXTERNAL_OPTION",
417-
"name": "OVERMAP_MAXIMUM_URBANITY",
418-
"//": "How urban do we allow our megacities to go? Mostly functions as a multiple of map settings city size.",
419-
"stype": "int",
420-
"value": 8
421-
},
422310
{
423311
"type": "EXTERNAL_OPTION",
424312
"name": "OVERRIDE_VEHICLE_INIT_STATE",

‎data/json/effects_on_condition/nether_eocs/dimensions.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
[
2+
{
3+
"type": "effect_on_condition",
4+
"id": "EOC_ABYSS_DIMENSION_TELEPORT",
5+
"global": true,
6+
"effect": [
7+
{
8+
"u_travel_to_dimension": "abyss",
9+
"npc_travel_radius": 0,
10+
"region_type": "nether_abyss",
11+
"npc_travel_filter": "none",
12+
"fail_message": "Nothing happens.",
13+
"success_message": "The abyss opens up around you."
14+
},
15+
{ "u_spawn_item": "default_dimension_teleport_orb" }
16+
]
17+
},
18+
{
19+
"type": "effect_on_condition",
20+
"id": "EOC_DEFAULT_DIMENSION_TELEPORT",
21+
"global": true,
22+
"effect": [
23+
{
24+
"u_travel_to_dimension": "",
25+
"npc_travel_radius": 0,
26+
"npc_travel_filter": "none",
27+
"fail_message": "Nothing seems to change.",
28+
"success_message": "The familiar world re-appears."
29+
},
30+
{ "u_spawn_item": "abyss_teleport_orb" }
31+
]
32+
}
33+
]

‎data/json/itemgroups/artifacts.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"id": "microlab_artifacts",
55
"subtype": "distribution",
66
"entries": [
7+
{ "item": "abyss_teleport_orb", "prob": 1 },
78
{
89
"group": "twisted_geometry",
910
"artifact": {

‎data/json/items/nether.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,37 @@
3232
},
3333
"description": "This defies easy description, it feels solid but the surface is yielding. Looking at it you have a strange desire to call it a door."
3434
},
35+
{
36+
"type": "ITEM",
37+
"id": "abyss_teleport_orb",
38+
"name": { "str_sp": "black glass orb" },
39+
"description": "A mysterious black glass orb. It seems to have endless depths hidden in it.",
40+
"color": "black",
41+
"symbol": "o",
42+
"weight": "1 kg",
43+
"volume": "500 ml",
44+
"flags": [ "SINGLE_USE" ],
45+
"use_action": {
46+
"type": "effect_on_conditions",
47+
"consume": true,
48+
"description": "Gaze into the orb.",
49+
"effect_on_conditions": [ "EOC_ABYSS_DIMENSION_TELEPORT" ]
50+
}
51+
},
52+
{
53+
"type": "ITEM",
54+
"id": "default_dimension_teleport_orb",
55+
"copy-from": "abyss_teleport_orb",
56+
"name": { "str_sp": "dull brown orb" },
57+
"description": "A dull brown orb. The surface has the texture of dried earth.",
58+
"color": "brown",
59+
"use_action": {
60+
"type": "effect_on_conditions",
61+
"consume": true,
62+
"description": "Squeeze the orb.",
63+
"effect_on_conditions": [ "EOC_DEFAULT_DIMENSION_TELEPORT" ]
64+
}
65+
},
3566
{
3667
"type": "ITEM",
3768
"subtypes": [ "TOOL" ],

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,64 @@
4848
"rail_connection": "local_railroad"
4949
}
5050
},
51+
{
52+
"type": "region_settings",
53+
"id": "nether_abyss",
54+
"rivers": null,
55+
"lakes": null,
56+
"ocean": null,
57+
"ravines": null,
58+
"forests": null,
59+
"forest_trails": null,
60+
"highways": null,
61+
"cities": null,
62+
"forest_composition": "no_forests",
63+
"map_extras": "no_map_extras",
64+
"terrain_furniture": "default",
65+
"weather": "default",
66+
"place_roads": false,
67+
"place_specials": false,
68+
"neighbor_connections": false,
69+
"default_oter": [
70+
"nether_glass_deep_north",
71+
"nether_glass_deep_north",
72+
"nether_glass_deep_north",
73+
"nether_glass_deep_north",
74+
"nether_glass_deep_north",
75+
"nether_glass_deep_north",
76+
"nether_glass_deep_north",
77+
"nether_glass_deep_north",
78+
"nether_glass_deep_north",
79+
"nether_glass_deep_north",
80+
"nether_glass_deep_north",
81+
"nether_glass_deep_north",
82+
"nether_glass_deep_north",
83+
"nether_glass_deep_north",
84+
"nether_glass_deep_north",
85+
"nether_glass_deep_north",
86+
"nether_glass_deep_north",
87+
"nether_glass_deep_north",
88+
"nether_glass_deep_north",
89+
"nether_glass_deep_north",
90+
"nether_glass_deep_north"
91+
],
92+
"default_groundcover": [ [ "t_nether_glass_floor", 1 ] ],
93+
"feature_flag_settings": { "blacklist": [ ], "whitelist": [ ] },
94+
"//": "ignored",
95+
"connections": {
96+
"intra_city_road_connection": "local_road",
97+
"inter_city_road_connection": "local_road",
98+
"trail_connection": "forest_trail",
99+
"sewer_connection": "sewer_tunnel",
100+
"subway_connection": "subway_tunnel",
101+
"rail_connection": "local_railroad"
102+
}
103+
},
104+
{
105+
"type": "region_settings_forest_mapgen",
106+
"id": "no_forests",
107+
"biomes": [ ]
108+
},
51109
{
52110
"type": "region_settings_map_extras",
53111
"id": "no_map_extras",

‎data/mods/Backrooms/game_balance.json‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@
135135
"map_extras": "default_backrooms",
136136
"terrain_furniture": "default_backrooms",
137137
"weather": "default_backrooms",
138+
"neighbor_connections": false,
139+
"place_roads": false,
138140
"default_oter": [
139141
"backroom_border",
140142
"backroom_border",

‎data/mods/MA/game_balance.json‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,5 @@
1010
"name": "OVERMAP_PREGENERATED_PATH",
1111
"stype": "string_input",
1212
"value": "MA/MA_overmap"
13-
},
14-
{
15-
"type": "EXTERNAL_OPTION",
16-
"name": "OVERMAP_POPULATE_OUTSIDE_CONNECTIONS_FROM_NEIGHBORS",
17-
"stype": "bool",
18-
"value": true
19-
},
20-
{
21-
"type": "EXTERNAL_OPTION",
22-
"name": "OVERMAP_PLACE_SWAMPS",
23-
"stype": "bool",
24-
"value": false
25-
},
26-
{
27-
"type": "EXTERNAL_OPTION",
28-
"name": "OVERMAP_PLACE_SPECIALS",
29-
"stype": "bool",
30-
"value": true
3113
}
3214
]

‎data/mods/TEST_DATA/known_good_uncrafts.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"type": "test_data",
44
"//": "dda",
55
"known_good_uncraft": [
6+
"abyss_teleport_orb",
67
"aerosol_paint",
78
"airsoft_helmet_stripped",
89
"art_beads",
@@ -43,6 +44,7 @@
4344
"artifact_scp_doc",
4445
"butane",
4546
"candle_wax",
47+
"default_dimension_teleport_orb",
4648
"fake_mill_vertical",
4749
"flare_nitrate",
4850
"gunpowder",

‎data/mods/classic_zombies/modinfo.json‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -49,60 +49,6 @@
4949
"stype": "float",
5050
"value": -113.49
5151
},
52-
{
53-
"type": "EXTERNAL_OPTION",
54-
"name": "OVERMAP_FOREST_INCREASE_NORTH",
55-
"stype": "float",
56-
"value": 0.1
57-
},
58-
{
59-
"type": "EXTERNAL_OPTION",
60-
"name": "OVERMAP_FOREST_INCREASE_EAST",
61-
"stype": "float",
62-
"value": 0.0
63-
},
64-
{
65-
"type": "EXTERNAL_OPTION",
66-
"name": "OVERMAP_FOREST_INCREASE_WEST",
67-
"stype": "float",
68-
"value": 0.1
69-
},
70-
{
71-
"type": "EXTERNAL_OPTION",
72-
"name": "OVERMAP_FOREST_INCREASE_SOUTH",
73-
"stype": "float",
74-
"value": 0.0
75-
},
76-
{
77-
"type": "EXTERNAL_OPTION",
78-
"name": "OVERMAP_FOREST_LIMIT",
79-
"stype": "float",
80-
"value": 0.6
81-
},
82-
{
83-
"type": "EXTERNAL_OPTION",
84-
"name": "OVERMAP_URBAN_INCREASE_NORTH",
85-
"stype": "int",
86-
"value": -1
87-
},
88-
{
89-
"type": "EXTERNAL_OPTION",
90-
"name": "OVERMAP_URBAN_INCREASE_EAST",
91-
"stype": "int",
92-
"value": 0
93-
},
94-
{
95-
"type": "EXTERNAL_OPTION",
96-
"name": "OVERMAP_URBAN_INCREASE_WEST",
97-
"stype": "int",
98-
"value": -1
99-
},
100-
{
101-
"type": "EXTERNAL_OPTION",
102-
"name": "OVERMAP_URBAN_INCREASE_SOUTH",
103-
"stype": "int",
104-
"value": 0
105-
},
10652
{
10753
"type": "EXTERNAL_OPTION",
10854
"name": "DEFAULT_REGION",

0 commit comments

Comments
 (0)