Skip to content

Commit de723be

Browse files
John-CandleburyMaleclypsegithub-actions[bot]
authored
Aftershock: Replace remaining vanilla robots with more setting appropriate ones (#82588)
* New ruin robots and robot-gun updates * Update robot spawn groups to remove vanilla entries * Apply suggestions from code review * Add new monster group 'GROUP_CRYO_LAB' * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Rename robot to avoid repeats --------- Co-authored-by: Maleclypse <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 51e231e commit de723be

File tree

9 files changed

+108
-201
lines changed

9 files changed

+108
-201
lines changed

‎data/mods/aftershock_exoplanet/itemgroups/loot_corpse_groups.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,17 @@
6565
{ "item": "afs_triple_stacker_pouch" },
6666
{ "item": "bot_wraitheon_kaburaya", "prob": 20, "count": [ 1, 2 ] }
6767
]
68+
},
69+
{
70+
"type": "item_group",
71+
"subtype": "collection",
72+
"id": "dead_old_imaginifer_laser",
73+
"entries": [ { "group": "afs_any_laser_mag", "prob": 90 } ]
74+
},
75+
{
76+
"type": "item_group",
77+
"subtype": "collection",
78+
"id": "dead_old_imaginifer",
79+
"entries": [ { "group": "afs_any_laser_mag", "prob": 10 } ]
6880
}
6981
]

‎data/mods/aftershock_exoplanet/items/gun/laser.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@
4141
"energy_drain": "0 kJ",
4242
"flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
4343
},
44+
{
45+
"id": "afs_light_cannon_mon",
46+
"type": "ITEM",
47+
"subtypes": [ "GUN" ],
48+
"copy-from": "afs_v29",
49+
"name": { "str": "light cannon" },
50+
"ranged_damage": { "damage_type": "afs_laser", "amount": 25 },
51+
"energy_drain": "0 kJ",
52+
"flags": [ "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
53+
},
4454
{
4555
"id": "laser_cannon_xray",
4656
"looks_like": "ar15",

‎data/mods/aftershock_exoplanet/maps/lab_cryo_room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"furniture": { "7": "f_console", "P": "f_cooling_pylon", "C": "f_cryo_pod", "&": "f_trashcan", "W": "f_workbench", "R": "f_crispr" },
3737
"terrain": { "*": "t_thconc_floor" },
3838
"place_traps": [ { "trap": "tr_cryo_pod_switch", "x": [ 5 ], "y": [ 8 ] } ],
39-
"place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ],
39+
"place_monsters": [ { "monster": "AFS_GROUP_ROBOT_MODERATE_RISK", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 5 ] } ],
4040
"mapping": {
4141
"l": { "items": [ { "item": "gear_soldier_sidearm", "chance": 10 } ] },
4242
"C": { "items": [ { "item": "afs_weapons_rare", "chance": 3 } ] },

‎data/mods/aftershock_exoplanet/maps/mapgen/municipal_microreactor.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"B": [ { "item": "textbooks", "chance": 50 }, { "item": "manuals", "chance": 50 } ]
4848
},
4949
"place_items": [ ],
50-
"place_monsters": [ { "monster": "GROUP_LAB", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ] } ]
50+
"place_monsters": [ { "monster": "AFS_GROUP_ROBOT_MODERATE_RISK", "chance": 2, "x": [ 2, 21 ], "y": [ 2, 21 ] } ]
5151
}
5252
},
5353
{
@@ -199,8 +199,8 @@
199199
"####-d6 6d -YYY.<--#####",
200200
"####-Yh hY -.. .--#----#",
201201
"####- -222--##- ~-#",
202-
"####- 6-YYYT----2--#",
203-
"####- h6- T-l b l-#",
202+
"####- 6-YYYY----2--#",
203+
"####- h6- -l b l-#",
204204
"####- ^ 6-G55--l b l-#",
205205
"####--2----- 2 l-#",
206206
"####- -(22(-------#",
@@ -232,8 +232,7 @@
232232
{ "item": "nuclear_reactor", "x": 11, "y": 7, "chance": 100 },
233233
{ "item": "nuclear_reactor", "x": 12, "y": 7, "chance": 100 }
234234
],
235-
"place_monsters": [ { "monster": "GROUP_LAB", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 3 ] } ],
236-
"monster": { "T": { "monster": "mon_turret_rifle" } }
235+
"place_monsters": [ { "monster": "AFS_GROUP_ROBOT_MODERATE_RISK", "x": [ 2, 21 ], "y": [ 2, 21 ], "repeat": [ 1, 3 ] } ]
237236
}
238237
},
239238
{

‎data/mods/aftershock_exoplanet/maps/mapgen/robot_dispatch.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"5": [ [ "f_drone_ai_core_broken", 20 ], [ "f_drone_ai_core", 1 ] ],
4040
"6": "f_ancient_processor"
4141
},
42-
"monsters": { "z": { "monster": "GROUP_UTILIBOT" } },
42+
"monsters": { "z": { "monster": "AFS_GROUP_ROBOT_NEUTRAL_OLD" } },
4343
"items": { "1": { "item": "old_industrial_bot_storage", "chance": 20 } },
4444
"place_nested": [ { "chunks": [ { "param": "lightstatus", "fallback": "null" } ], "x": 0, "y": 0 } ]
4545
}

‎data/mods/aftershock_exoplanet/monsters/monster_groups/monster_groups.json‎

Lines changed: 9 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88
{ "monster": "mon_uplifted_ape_zed", "weight": 8, "cost_multiplier": 10, "starts": "181 days" }
99
]
1010
},
11+
{
12+
"type": "monstergroup",
13+
"id": "GROUP_CRYO_LAB",
14+
"monsters": [
15+
{ "monster": "mon_mutant_cryo", "weight": 940, "cost_multiplier": 2 },
16+
{ "monster": "mon_cryokinetic", "weight": 8, "cost_multiplier": 10 }
17+
]
18+
},
1119
{
1220
"type": "monstergroup",
1321
"id": "GROUP_ZOMBIE_MID",
@@ -124,10 +132,8 @@
124132
"id": "AFS_GROUP_AUG_CLINIC",
125133
"monsters": [
126134
{ "monster": "mon_broken_cyborg", "weight": 100 },
127-
{ "monster": "mon_zombie_electric", "weight": 450 },
128135
{ "monster": "mon_prototype_cyborg", "weight": 100, "cost_multiplier": 2 },
129-
{ "monster": "mon_zombie_technician", "weight": 300 },
130-
{ "monster": "mon_secubot", "weight": 50, "cost_multiplier": 3 }
136+
{ "group": "AFS_GROUP_ROBOT_MODERATE_RISK", "weight": 50, "cost_multiplier": 2, "pack_size": [ 1, 2 ] }
131137
]
132138
},
133139
{
@@ -140,50 +146,6 @@
140146
{ "monster": "mon_zombie_oliphant", "weight": 70, "cost_multiplier": 10 }
141147
]
142148
},
143-
{
144-
"type": "monstergroup",
145-
"id": "GROUP_CENTRAL_LAB",
146-
"monsters": [
147-
{ "monster": "mon_zombie_upliftedbear", "weight": 3, "cost_multiplier": 10 },
148-
{ "monster": "mon_uplifted_ape_zed", "weight": 10, "cost_multiplier": 5 },
149-
{ "monster": "mon_zombie_oliphant", "weight": 1, "cost_multiplier": 10 }
150-
]
151-
},
152-
{
153-
"type": "monstergroup",
154-
"id": "GROUP_RIVER",
155-
"is_animal": true,
156-
"monsters": [
157-
{ "monster": "mon_uplifted_octupus", "weight": 3, "cost_multiplier": 10 },
158-
{ "monster": "mon_zombie_upliftedoctopus", "weight": 1, "cost_multiplier": 10 },
159-
{ "monster": "mon_deep_go", "weight": 1, "cost_multiplier": 10, "starts": "83 days" },
160-
{ "monster": "mon_deep_go_slaver", "weight": 1, "cost_multiplier": 10, "starts": "181 days" }
161-
]
162-
},
163-
{
164-
"type": "monstergroup",
165-
"id": "GROUP_CRYO_LAB",
166-
"monsters": [
167-
{ "monster": "mon_mutant_experimental", "weight": 30, "cost_multiplier": 2 },
168-
{ "monster": "mon_mutant_evolved", "weight": 5, "cost_multiplier": 10 },
169-
{ "monster": "mon_broken_cyborg", "weight": 8, "cost_multiplier": 10 },
170-
{ "monster": "mon_mutant_cryo", "weight": 940, "cost_multiplier": 2 },
171-
{ "monster": "mon_mi_go", "weight": 5, "cost_multiplier": 10, "starts": "83 days" },
172-
{ "monster": "mon_shoggoth", "weight": 3, "cost_multiplier": 10, "starts": "181 days" },
173-
{ "monster": "mon_cryokinetic", "weight": 8, "cost_multiplier": 10 }
174-
]
175-
},
176-
{
177-
"type": "monstergroup",
178-
"id": "GROUP_LAB",
179-
"monsters": [
180-
{ "monster": "mon_moxie_scavenger", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] },
181-
{ "monster": "mon_moxie_spartan", "weight": 25, "cost_multiplier": 0 },
182-
{ "monster": "mon_moxie_regenerator", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] },
183-
{ "monster": "mon_moxie_grabby", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] },
184-
{ "monster": "mon_human_biomachine", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 4 ] }
185-
]
186-
},
187149
{
188150
"type": "monstergroup",
189151
"id": "GROUP_SWAMP",

‎data/mods/aftershock_exoplanet/monsters/monster_groups/robot_groups.json‎

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

‎data/mods/aftershock_exoplanet/monsters/monster_groups/robot_monster_groups.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
"default": "mon_advbot_laser",
3939
"monsters": [
4040
{ "monster": "mon_advbot_laser", "weight": 100, "cost_multiplier": 40 },
41-
{ "monster": "afs_mon_sentinel_lx", "weight": 100, "cost_multiplier": 30 },
42-
{ "monster": "mon_wraitheon_imaginifer", "weight": 100, "cost_multiplier": 100 },
43-
{ "monster": "mon_wraitheon_imaginifer_stealth", "weight": 100, "cost_multiplier": 100 }
41+
{ "monster": "mon_old_imaginifer_laser", "weight": 100, "cost_multiplier": 100 },
42+
{ "monster": "mon_old_imaginifer", "weight": 100, "cost_multiplier": 100 }
4443
]
4544
},
4645
{

0 commit comments

Comments
 (0)