Skip to content

Commit 491f2f2

Browse files
authored
Merge pull request #82711 from Standing-Storm/rework-extra-spawns
[MoM] Rework crystal field spawns
2 parents bff9ae0 + 7c70c6b commit 491f2f2

File tree

6 files changed

+132
-33
lines changed

6 files changed

+132
-33
lines changed

data/mods/MindOverMatter/mapgen/map_extras/glass_and_crystal.json

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,20 @@
44
"update_mapgen_id": "mx_glass_and_crystal",
55
"object": {
66
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
7-
"place_nested": [ { "chunks": [ "glass_and_crystal_chunk" ], "x": [ 2, 15 ], "y": [ 2, 15 ] } ],
8-
"monsters": { " ": { "monster": "GROUP_CRYSTAL_FIELD", "chance": 1, "density": 0.0001 } }
7+
"place_nested": [
8+
{ "chunks": [ "glass_and_crystal_chunk" ], "x": [ 2, 15 ], "y": [ 2, 15 ] },
9+
{
10+
"chunks": [
11+
[ "null", 1 ],
12+
[ "mx_glass_and_crystal_monsters_migo", 5 ],
13+
[ "mx_glass_and_crystal_monsters_nether", 8 ],
14+
[ "mx_glass_and_crystal_monsters_feral_psions", 5 ],
15+
[ "mx_glass_and_crystal_monsters_mixed", 3 ]
16+
],
17+
"x": 0,
18+
"y": 0
19+
}
20+
]
921
}
1022
},
1123
{
@@ -62,5 +74,40 @@
6274
"terrain": { "X": "t_nether_stone" },
6375
"place_fields": [ { "field": "fd_fatigue", "x": 0, "y": 0, "intensity": 3 } ]
6476
}
77+
},
78+
{
79+
"type": "mapgen",
80+
"nested_mapgen_id": "mx_glass_and_crystal_monsters_migo",
81+
"object": {
82+
"mapgensize": [ 24, 24 ],
83+
"place_monster": [
84+
{ "group": "GROUP_MI-GO_CAMP_OM", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 75, "repeat": [ 3, 6 ] },
85+
{ "group": "GROUP_MI-GO_PSIONS", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 65, "repeat": [ 0, 2 ] }
86+
]
87+
}
88+
},
89+
{
90+
"type": "mapgen",
91+
"nested_mapgen_id": "mx_glass_and_crystal_monsters_nether",
92+
"object": {
93+
"mapgensize": [ 24, 24 ],
94+
"place_monster": [ { "group": "GROUP_NETHER_PORTAL", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 85, "repeat": [ 4, 8 ] } ]
95+
}
96+
},
97+
{
98+
"type": "mapgen",
99+
"nested_mapgen_id": "mx_glass_and_crystal_monsters_feral_psions",
100+
"object": {
101+
"mapgensize": [ 24, 24 ],
102+
"place_monster": [ { "group": "GROUP_FERAL_PSYCHIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 85, "repeat": [ 2, 4 ] } ]
103+
}
104+
},
105+
{
106+
"type": "mapgen",
107+
"nested_mapgen_id": "mx_glass_and_crystal_monsters_mixed",
108+
"object": {
109+
"mapgensize": [ 24, 24 ],
110+
"place_monster": [ { "group": "GROUP_CRYSTAL_FIELD", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 85, "repeat": [ 5, 13 ] } ]
111+
}
65112
}
66113
]
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
[
2+
{
3+
"type": "mapgen",
4+
"nested_mapgen_id": "nether_crystal_field_monsters_migo",
5+
"object": {
6+
"mapgensize": [ 24, 24 ],
7+
"place_monster": [
8+
{ "group": "GROUP_MI-GO_CAMP_OM", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 4, 15 ] },
9+
{ "group": "GROUP_MI-GO_PSIONS", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 0, 2 ] }
10+
]
11+
}
12+
},
13+
{
14+
"type": "mapgen",
15+
"nested_mapgen_id": "nether_crystal_field_monsters_nether",
16+
"object": {
17+
"mapgensize": [ 24, 24 ],
18+
"place_monster": [ { "group": "GROUP_NETHER_PORTAL", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 8, 15 ] } ]
19+
}
20+
},
21+
{
22+
"type": "mapgen",
23+
"nested_mapgen_id": "nether_crystal_field_monsters_feral_psions",
24+
"object": {
25+
"mapgensize": [ 24, 24 ],
26+
"place_monster": [ { "group": "GROUP_FERAL_PSYCHIC", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 3, 6 ] } ]
27+
}
28+
},
29+
{
30+
"type": "mapgen",
31+
"nested_mapgen_id": "nether_crystal_field_monsters_mixed",
32+
"object": {
33+
"mapgensize": [ 24, 24 ],
34+
"place_monster": [
35+
{ "group": "GROUP_CRYSTAL_FIELD", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 100, "repeat": [ 10, 16 ] },
36+
{
37+
"group": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE",
38+
"x": [ 0, 23 ],
39+
"y": [ 0, 23 ],
40+
"chance": 100,
41+
"repeat": [ 2, 5 ]
42+
}
43+
]
44+
}
45+
}
46+
]

data/mods/MindOverMatter/overmap/nether_crystal_field.json renamed to data/mods/MindOverMatter/mapgen/nether_crystal_field.json

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,21 @@
4141
[ "t_nether_stone", 1 ]
4242
]
4343
},
44-
"monsters": {
45-
"_": [
46-
{ "monster": "GROUP_CRYSTAL_FIELD", "chance": 1, "density": 0.0003 },
47-
{ "monster": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE", "chance": 10, "density": 0.0003 }
48-
],
49-
"A": { "monster": "GROUP_CRYSTAL_FIELD", "chance": 1, "density": 0.0003 }
50-
},
5144
"nested": { "A": { "chunks": [ [ "crystal_moss_or_trees_3x3", 1 ], [ "null", 15 ] ] } },
52-
"place_nested": [ { "chunks": [ "crystal_field_central_10x10" ], "x": 7, "y": 7 } ]
45+
"place_nested": [
46+
{ "chunks": [ "crystal_field_central_10x10" ], "x": 7, "y": 7 },
47+
{
48+
"chunks": [
49+
[ "null", 1 ],
50+
[ "mx_glass_and_crystal_monsters_migo", 8 ],
51+
[ "mx_glass_and_crystal_monsters_nether", 16 ],
52+
[ "mx_glass_and_crystal_monsters_feral_psions", 8 ],
53+
[ "mx_glass_and_crystal_monsters_mixed", 4 ]
54+
],
55+
"x": 0,
56+
"y": 0
57+
}
58+
]
5359
}
5460
},
5561
{
@@ -128,8 +134,7 @@
128134
"S": [ [ "t_nether_water_sh", 1 ], [ "t_nether_stone", 1 ] ],
129135
" ": "t_null"
130136
},
131-
"furniture": { "S": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 3 ] ] },
132-
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD", "x": [ 0, 9 ], "y": [ 0, 9 ], "chance": 50, "repeat": [ 2, 4 ] } ]
137+
"furniture": { "S": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 3 ] ] }
133138
}
134139
},
135140
{
@@ -152,19 +157,14 @@
152157
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
153158
"terrain": { "C": "t_nether_stone", "G": [ [ "t_nether_stone", 2 ], [ "t_null", 2 ] ], "N": "t_nether_stone", " ": "t_null" },
154159
"furniture": { "C": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 1 ] ] },
155-
"place_nested": [ { "chunks": [ "crystal_field_chunk_center_2x2" ], "x": 4, "y": 4 } ],
156-
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD", "x": [ 0, 9 ], "y": [ 0, 9 ], "chance": 50, "repeat": [ 2, 4 ] } ]
160+
"place_nested": [ { "chunks": [ "crystal_field_chunk_center_2x2" ], "x": 4, "y": 4 } ]
157161
}
158162
},
159163
{
160164
"type": "mapgen",
161165
"nested_mapgen_id": "crystal_field_chunk_center_2x2",
162166
"weight": 1000,
163-
"object": {
164-
"mapgensize": [ 2, 2 ],
165-
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
166-
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE", "x": [ 0, 1 ], "y": [ 0, 1 ], "chance": 50, "repeat": [ 1, 3 ] } ]
167-
}
167+
"object": { "mapgensize": [ 2, 2 ], "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ] }
168168
},
169169
{
170170
"type": "mapgen",
@@ -217,7 +217,6 @@
217217
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
218218
"terrain": { "C": "t_nether_stone" },
219219
"furniture": { "N": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 1 ] ] },
220-
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE", "x": [ 0, 1 ], "y": [ 0, 1 ], "chance": 50, "repeat": [ 1, 3 ] } ],
221220
"items": { "C": { "item": "dist_matrix_crystals", "chance": 50 } }
222221
}
223222
},
@@ -234,7 +233,6 @@
234233
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
235234
"terrain": { "C": "t_nether_stone" },
236235
"furniture": { "N": [ [ "f_nether_crystal_structure", 1 ], [ "f_null", 1 ] ] },
237-
"place_monsters": [ { "monster": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE", "x": [ 0, 1 ], "y": [ 0, 1 ], "chance": 50, "repeat": [ 1, 3 ] } ],
238236
"items": { "C": { "item": "dist_matrix_crystals", "chance": 50 } }
239237
}
240238
}

data/mods/MindOverMatter/monstergroups/monstergroups_edited.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@
341341
},
342342
{
343343
"type": "monstergroup",
344-
"id": "GROUP_MI-GO_CAMP_OM",
344+
"id": "GO_CAMP_OM",
345345
"monsters": [
346346
{ "monster": "mon_mi_go_telepath", "weight": 50, "cost_multiplier": 20, "starts": "35 days" },
347347
{ "monster": "mon_mi_go_photokinetic", "weight": 50, "cost_multiplier": 2, "starts": "35 days" },
@@ -395,14 +395,5 @@
395395
"id": "GROUP_TRIFFID_HEARTGUARDS",
396396
"default": "mon_triffid",
397397
"monsters": [ { "group": "GROUP_TRIFFID_PSIONS", "weight": 150, "cost_multiplier": 2 } ]
398-
},
399-
{
400-
"type": "monstergroup",
401-
"id": "GROUP_TRIFFID_PSIONS",
402-
"monsters": [
403-
{ "monster": "mon_triffid_clairsentient", "weight": 400 },
404-
{ "monster": "mon_triffid_pyrokinetic", "weight": 400 },
405-
{ "monster": "mon_triffid_teleporter", "weight": 200 }
406-
]
407398
}
408399
]

data/mods/MindOverMatter/monstergroups/monstergroups_new.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,24 @@
117117
"type": "monstergroup",
118118
"monsters": [ { "monster": "mon_swarm_structure", "weight": 60, "cost_multiplier": 2 } ]
119119
},
120+
{
121+
"type": "monstergroup",
122+
"id": "GROUP_MI-GO_PSIONS",
123+
"monsters": [
124+
{ "monster": "mon_mi_go_telepath", "weight": 50, "cost_multiplier": 20, "starts": "35 days" },
125+
{ "monster": "mon_mi_go_photokinetic", "weight": 50, "cost_multiplier": 2, "starts": "35 days" },
126+
{ "monster": "mon_mi_go_biokinetic", "weight": 20, "cost_multiplier": 70, "starts": "35 days" }
127+
]
128+
},
129+
{
130+
"type": "monstergroup",
131+
"id": "GROUP_TRIFFID_PSIONS",
132+
"monsters": [
133+
{ "monster": "mon_triffid_clairsentient", "weight": 400 },
134+
{ "monster": "mon_triffid_pyrokinetic", "weight": 400 },
135+
{ "monster": "mon_triffid_teleporter", "weight": 200 }
136+
]
137+
},
120138
{
121139
"type": "monstergroup",
122140
"id": "GROUP_LAB_RESEARCH",

data/mods/MindOverMatter/overmap/overmap_specials.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
"locations": [ "wilderness" ],
77
"city_distance": [ 20, -1 ],
88
"city_sizes": [ 0, 20 ],
9-
"occurrences": [ 0, 2 ],
10-
"spawns": { "group": "GROUP_CRYSTAL_FIELD", "population": [ 1, 4 ], "radius": [ 1, 3 ] }
9+
"occurrences": [ 0, 2 ]
1110
},
1211
{
1312
"type": "overmap_special",

0 commit comments

Comments
 (0)