Skip to content

Commit 19a09da

Browse files
BonniePandoraBonniePandora
authored
hAI factions fixes & tweaks (#943)
1 parent e522938 commit 19a09da

File tree

1 file changed

+126
-21
lines changed

1 file changed

+126
-21
lines changed

‎code/modules/mob/living/carbon/human/ai/brain/ai_brain_factions.dm

Lines changed: 126 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,99 @@
9797
/datum/human_ai_faction/proc/get_shoot_to_kill()
9898
return shoot_to_kill
9999

100+
/datum/human_ai_faction/colonist
101+
faction = FACTION_COLONIST
102+
friendly_factions = list(
103+
FACTION_SURVIVOR,
104+
FACTION_MARINE,
105+
FACTION_ARMY,
106+
FACTION_NAVY,
107+
FACTION_UPP,
108+
FACTION_MARSHAL,
109+
FACTION_TWE,
110+
FACTION_WY,
111+
FACTION_PMC,
112+
)
113+
neutral_factions = list(
114+
FACTION_FREELANCER,
115+
FACTION_CONTRACTOR,
116+
FACTION_MERCENARY,
117+
FACTION_CANC,
118+
FACTION_TWE_REBEL,
119+
FACTION_UA_REBEL,
120+
)
121+
122+
/datum/human_ai_faction/contractor
123+
faction = FACTION_CONTRACTOR
124+
friendly_factions = list(
125+
FACTION_SURVIVOR,
126+
FACTION_MARINE,
127+
FACTION_ARMY,
128+
FACTION_NAVY,
129+
FACTION_UPP,
130+
FACTION_MARSHAL,
131+
FACTION_TWE,
132+
FACTION_WY,
133+
FACTION_PMC,
134+
)
135+
neutral_factions = list(
136+
FACTION_FREELANCER,
137+
FACTION_MERCENARY,
138+
FACTION_CANC,
139+
FACTION_TWE_REBEL,
140+
FACTION_UA_REBEL,
141+
)
142+
143+
/datum/human_ai_faction/merc
144+
faction = FACTION_MERCENARY
145+
friendly_factions = list(
146+
FACTION_SURVIVOR,
147+
FACTION_MARINE,
148+
FACTION_ARMY,
149+
FACTION_NAVY,
150+
FACTION_UPP,
151+
FACTION_MARSHAL,
152+
FACTION_TWE,
153+
FACTION_WY,
154+
FACTION_PMC,
155+
)
156+
neutral_factions = list(
157+
FACTION_FREELANCER,
158+
FACTION_CONTRACTOR,
159+
FACTION_CANC,
160+
FACTION_TWE_REBEL,
161+
FACTION_UA_REBEL,
162+
)
163+
164+
/datum/human_ai_faction/lancer
165+
faction = FACTION_FREELANCER
166+
friendly_factions = list(
167+
FACTION_SURVIVOR,
168+
FACTION_MARINE,
169+
FACTION_ARMY,
170+
FACTION_NAVY,
171+
FACTION_UPP,
172+
FACTION_MARSHAL,
173+
FACTION_TWE,
174+
FACTION_WY,
175+
FACTION_PMC,
176+
)
177+
neutral_factions = list(
178+
FACTION_CONTRACTOR,
179+
FACTION_MERCENARY,
180+
FACTION_CANC,
181+
FACTION_TWE_REBEL,
182+
FACTION_UA_REBEL,
183+
)
184+
100185
/datum/human_ai_faction/twerebel
101186
faction = FACTION_TWE_REBEL
102187
friendly_factions = list(
103188
FACTION_COLONIST,
104189
)
190+
neutral_factions = list(
191+
FACTION_SURVIVOR,
192+
)
105193
enter_combat_lines = list(
106194
"Look alive!",
107195
"There!",
@@ -207,6 +295,9 @@
207295
friendly_factions = list(
208296
FACTION_COLONIST,
209297
)
298+
neutral_factions = list(
299+
FACTION_SURVIVOR,
300+
)
210301
enter_combat_lines = list(
211302
"CONTACT!",
212303
"Contact!",
@@ -386,7 +477,7 @@
386477
FACTION_FREELANCER,
387478
FACTION_CONTRACTOR,
388479
FACTION_TWE,
389-
FACTION_UPP,
480+
FACTION_PMC,
390481
FACTION_MERCENARY,
391482
FACTION_SURVIVOR,
392483
)
@@ -455,14 +546,14 @@
455546
FACTION_ARMY,
456547
FACTION_NAVY,
457548
FACTION_COLONIST,
549+
FACTION_MARSHAL,
458550
)
459551
neutral_factions = list(
460-
FACTION_MARSHAL,
461552
FACTION_TWE,
462553
FACTION_WY,
554+
FACTION_PMC,
463555
FACTION_FREELANCER,
464556
FACTION_CONTRACTOR,
465-
FACTION_UPP,
466557
FACTION_MERCENARY,
467558
FACTION_SURVIVOR,
468559
)
@@ -658,14 +749,14 @@
658749
FACTION_MARINE,
659750
FACTION_NAVY,
660751
FACTION_COLONIST,
752+
FACTION_MARSHAL,
661753
)
662754
neutral_factions = list(
663-
FACTION_MARSHAL,
664755
FACTION_TWE,
665756
FACTION_WY,
757+
FACTION_PMC,
666758
FACTION_FREELANCER,
667759
FACTION_CONTRACTOR,
668-
FACTION_UPP,
669760
FACTION_MERCENARY,
670761
FACTION_SURVIVOR,
671762
)
@@ -861,14 +952,14 @@
861952
FACTION_MARINE,
862953
FACTION_ARMY,
863954
FACTION_COLONIST,
955+
FACTION_MARSHAL,
864956
)
865957
neutral_factions = list(
866-
FACTION_MARSHAL,
867958
FACTION_TWE,
868959
FACTION_WY,
960+
FACTION_PMC,
869961
FACTION_FREELANCER,
870962
FACTION_CONTRACTOR,
871-
FACTION_UPP,
872963
FACTION_MERCENARY,
873964
FACTION_SURVIVOR,
874965
)
@@ -1060,18 +1151,11 @@
10601151
/datum/human_ai_faction/upp
10611152
faction = FACTION_UPP
10621153
friendly_factions = list(
1063-
FACTION_ARMY,
1064-
FACTION_MARINE,
10651154
FACTION_COLONIST,
10661155
)
10671156
neutral_factions = list(
1068-
FACTION_TWE,
1069-
FACTION_WY,
10701157
FACTION_FREELANCER,
10711158
FACTION_CONTRACTOR,
1072-
FACTION_MARINE,
1073-
FACTION_ARMY,
1074-
FACTION_NAVY,
10751159
FACTION_MERCENARY,
10761160
FACTION_SURVIVOR,
10771161
)
@@ -1216,41 +1300,58 @@
12161300
"COVER ME!",
12171301
)
12181302

1219-
/datum/human_ai_faction/upp
1220-
faction = FACTION_UPP
1303+
/datum/human_ai_faction/canc
1304+
faction = FACTION_CANC
1305+
friendly_factions = list(
1306+
FACTION_COLONIST,
1307+
)
1308+
neutral_factions = list(
1309+
FACTION_SURVIVOR,
1310+
)
1311+
1312+
/datum/human_ai_faction/wy
1313+
faction = FACTION_WY
12211314
friendly_factions = list(
12221315
FACTION_COLONIST,
1223-
FACTION_PMC,
12241316
FACTION_TWE,
1225-
FACTION_MARINE,
1226-
FACTION_ARMY,
1227-
FACTION_NAVY,
1317+
FACTION_PMC,
1318+
FACTION_WY_DEATHSQUAD,
12281319
)
12291320
neutral_factions = list(
12301321
FACTION_FREELANCER,
12311322
FACTION_CONTRACTOR,
1323+
FACTION_MERCENARY,
12321324
FACTION_MARINE,
12331325
FACTION_ARMY,
12341326
FACTION_NAVY,
1235-
FACTION_MERCENARY,
1327+
FACTION_MARSHAL,
1328+
FACTION_SURVIVOR,
12361329
)
12371330

12381331
/datum/human_ai_faction/wy/pmc
12391332
faction = FACTION_PMC
12401333
friendly_factions = list(
12411334
FACTION_COLONIST,
12421335
FACTION_TWE,
1336+
FACTION_WY,
1337+
FACTION_WY_DEATHSQUAD,
12431338
)
12441339
neutral_factions = list(
12451340
FACTION_FREELANCER,
12461341
FACTION_CONTRACTOR,
12471342
FACTION_MERCENARY,
12481343
FACTION_MARINE,
1344+
FACTION_ARMY,
1345+
FACTION_NAVY,
1346+
FACTION_MARSHAL,
1347+
FACTION_SURVIVOR,
12491348
)
1349+
12501350
/datum/human_ai_faction/wy_deathsquad
12511351
faction = FACTION_WY_DEATHSQUAD
12521352
friendly_factions = list(
12531353
FACTION_WY,
1354+
FACTION_PMC,
12541355
)
12551356
enter_combat_lines = list(
12561357
"Visual confirmed, engaging.",
@@ -1286,7 +1387,11 @@
12861387
FACTION_FREELANCER,
12871388
FACTION_CONTRACTOR,
12881389
FACTION_MERCENARY,
1390+
FACTION_SURVIVOR,
12891391
FACTION_MARINE,
1392+
FACTION_ARMY,
1393+
FACTION_NAVY,
1394+
FACTION_MARSHAL,
12901395
)
12911396
enter_combat_lines = list(
12921397
"CONTACT!",

0 commit comments

Comments
 (0)