From caf27f2b1e1a0f4b8d0913f5563dc73a32f513f1 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 14:15:30 -0400 Subject: [PATCH 01/15] Removed isGuard --- data/randomEvents/PrisonerMajorEventData.yml | 342 ++++++++++++------- data/randomEvents/PrisonerMinorEventData.yml | 243 ++++++++----- 2 files changed, 389 insertions(+), 196 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index 2f3a4ab4a2..e40cbde8fa 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -30,9 +30,9 @@ events: # Any response with the UNIQUE enum requires separate code support. # Defaults to NONE, if not present. - effect: INJURY_PERCENT - # TRUE to affect guards, otherwise false. Used by some EventResultEffect values. - # Defaults to FALSE, if not present. - isGuard: TRUE + # Include one or more RandomEventEffectedPersonnelType + affectedPersonnelTypes: + - SECURITY_GUARD # Intensity of the effect. Affects different effects differently. See EventResultEffect # for more information. Defaults to 0, if not present. magnitude: 20 @@ -46,26 +46,32 @@ events: - effect: ESCAPE_PERCENT magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -10 @@ -73,13 +79,16 @@ events: - effect: ESCAPE magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -25 @@ -100,66 +109,81 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -25 effectsFailure: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -25 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -25 effectsFailure: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -25 @@ -169,45 +193,53 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -10 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -10 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -25 @@ -217,98 +249,121 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: ESCAPE_PERCENT magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: PRISONER_CAPACITY magnitude: -50 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: ESCAPE_PERCENT magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 40 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -25 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 40 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 40 - effect: ESCAPE_PERCENT magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -15 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 40 - effect: ESCAPE_PERCENT magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -50 @@ -332,7 +387,8 @@ events: # Magnitude 2, as the problem wasn't resolved magnitude: 2 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 effectsFailure: # 'Poison' (xd6 Fatigue) 10% of personnel @@ -340,7 +396,8 @@ events: # Magnitude 2, as the problem wasn't resolved magnitude: 2 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: PRISONER_CAPACITY magnitude: -15 @@ -360,59 +417,76 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 2 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: DEATH - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 3 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: DEATH - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -420,19 +494,24 @@ events: magnitude: -10 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: DEATH - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - prisonerEvent: BOMB @@ -451,13 +530,15 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: PRISONER_CAPACITY magnitude: -25 effectsFailure: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: ESCAPE magnitude: 20 @@ -466,7 +547,8 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: ESCAPE magnitude: 5 @@ -483,49 +565,59 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -15 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -15 @@ -583,81 +675,101 @@ events: - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -10 diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index 447a985189..e2a528939e 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -32,7 +32,8 @@ events: - effect: PRISONER_CAPACITY # TRUE to affect guards, otherwise false. Used by some EventResultEffect values. # Defaults to FALSE, if not present. - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS # Intensity of the effect. Affects different effects differently. See EventResultEffect # for more information. Defaults to 0, if not present. magnitude: 5 @@ -58,10 +59,12 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: INJURY - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 3 - prisonerEvent: WILD_STORIES @@ -81,7 +84,8 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - quality: RESPONSE_NEUTRAL @@ -92,7 +96,8 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER @@ -103,13 +108,15 @@ events: - effect: PRISONER_CAPACITY magnitude: 5 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - quality: RESPONSE_POSITIVE effectsSuccess: @@ -136,11 +143,13 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: PRISONER_CAPACITY magnitude: -10 @@ -226,10 +235,12 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - effect: FATIGUE_ALL - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: LOYALTY_ALL - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: -2 - prisonerEvent: RESCUE @@ -237,14 +248,16 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -252,14 +265,16 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 2 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -270,7 +285,8 @@ events: magnitude: 5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -281,12 +297,14 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_TECH_MECHANIC effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_TECH_MECHANIC - effect: PRISONER_CAPACITY @@ -294,12 +312,14 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_TECH_MECHANIC effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_TECH_MECHANIC - effect: PRISONER_CAPACITY @@ -307,7 +327,8 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_TECH_MECHANIC effectsFailure: @@ -336,10 +357,12 @@ events: magnitude: 5 effectsFailure: - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -15 @@ -351,10 +374,12 @@ events: - effect: NONE effectsFailure: - effect: INJURY - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 @@ -390,7 +415,8 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -448,14 +474,16 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -463,14 +491,16 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -478,14 +508,16 @@ events: - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -508,7 +540,8 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -525,7 +558,8 @@ events: - effect: NONE effectsFailure: - effect: LOYALTY_ONE - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: -3 - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -562,7 +596,8 @@ events: magnitude: 5 effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 @@ -627,14 +662,16 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -659,14 +696,16 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -715,13 +754,15 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 2 - effect: PRISONER_CAPACITY magnitude: -10 @@ -788,10 +829,12 @@ events: - effect: NONE effectsFailure: - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 5 - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 10 - effect: PRISONER_CAPACITY magnitude: -10 @@ -800,10 +843,12 @@ events: - effect: NONE effectsFailure: - effect: DEATH_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 10 - effect: DEATH_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -15 @@ -893,25 +938,31 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 2 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: PRISONER_CAPACITY magnitude: -5 @@ -950,25 +1001,31 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 2 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 2 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 @@ -1000,7 +1057,8 @@ events: - effect: NONE effectsFailure: - effect: DEATH - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -10 @@ -1019,37 +1077,43 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: LOYALTY_ONE - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: -5 - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: - effect: LOYALTY_ONE - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: -5 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE effectsSuccess: - effect: LOYALTY_ONE - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: -5 - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: LOYALTY_ONE - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: -5 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: LOYALTY_ONE - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: -5 effectsFailure: - effect: LOYALTY_ONE - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: -5 - effect: PRISONER_CAPACITY magnitude: -10 @@ -1175,26 +1239,30 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY magnitude: 10 effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -1202,12 +1270,14 @@ events: - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER effectsFailure: - effect: SKILL - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 skillType: S_LEADER - effect: PRISONER_CAPACITY @@ -1263,13 +1333,15 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -5 @@ -1292,42 +1364,51 @@ events: - quality: RESPONSE_POSITIVE effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 1 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: INJURY_PERCENT - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - effect: INJURY_PERCENT - isGuard: TRUE + affectedPersonnelTypes: + - SECURITY_GUARD magnitude: 1 - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 effectsFailure: - effect: INJURY - isGuard: FALSE + affectedPersonnelTypes: + - PRISONERS magnitude: 3 - effect: PRISONER_CAPACITY magnitude: -5 From 5507c806641223cf7dc138df89f78baad00969c8 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 14:25:49 -0400 Subject: [PATCH 02/15] Updated data to account for Unique cases --- data/randomEvents/PrisonerMajorEventData.yml | 24 ++++++++++++++++++++ data/randomEvents/PrisonerMinorEventData.yml | 6 +++++ 2 files changed, 30 insertions(+) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index e40cbde8fa..71efc1c25d 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -374,16 +374,28 @@ events: effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE + affectedPersonnelTypes: + - CAMP_FOLLOWERS + - COMBAT_PERSONNEL + - SUPPORT_PERSONNEL magnitude: 1 effectsFailure: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE + affectedPersonnelTypes: + - CAMP_FOLLOWERS + - COMBAT_PERSONNEL + - SUPPORT_PERSONNEL # Magnitude 2, as the problem wasn't resolved magnitude: 2 - quality: RESPONSE_NEUTRAL effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE + affectedPersonnelTypes: + - CAMP_FOLLOWERS + - COMBAT_PERSONNEL + - SUPPORT_PERSONNEL # Magnitude 2, as the problem wasn't resolved magnitude: 2 - effect: INJURY @@ -393,6 +405,10 @@ events: effectsFailure: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE + affectedPersonnelTypes: + - CAMP_FOLLOWERS + - COMBAT_PERSONNEL + - SUPPORT_PERSONNEL # Magnitude 2, as the problem wasn't resolved magnitude: 2 - effect: INJURY @@ -405,10 +421,18 @@ events: effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE + affectedPersonnelTypes: + - CAMP_FOLLOWERS + - COMBAT_PERSONNEL + - SUPPORT_PERSONNEL magnitude: 1 effectsFailure: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE + affectedPersonnelTypes: + - CAMP_FOLLOWERS + - COMBAT_PERSONNEL + - SUPPORT_PERSONNEL # Magnitude 2, as the problem wasn't resolved magnitude: 1 diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index e2a528939e..e5ef67be4e 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -786,6 +786,8 @@ events: effectsSuccess: # Remove all combat skills from a random Prisoner - effect: UNIQUE + affectedPersonnelTypes: + - PRISONERS - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -1049,6 +1051,8 @@ events: effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE + affectedPersonnelTypes: + - PRISONERS effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 @@ -1066,6 +1070,8 @@ events: effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE + affectedPersonnelTypes: + - PRISONERS - effect: SUPPORT_POINT magnitude: 1 effectsFailure: From e1534bbda71a730b83a1cd576ceb926bb2adb152 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 14:27:22 -0400 Subject: [PATCH 03/15] Legal --- data/randomEvents/PrisonerMajorEventData.yml | 2 +- data/randomEvents/PrisonerMinorEventData.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index 71efc1c25d..d88e322dbe 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -1,4 +1,4 @@ -# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. +# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. # To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/ # # NOTICE: The MegaMek organization is a non-profit group of volunteers diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index e5ef67be4e..722115084d 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -1,4 +1,4 @@ -# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. +# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0. # To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/ # # NOTICE: The MegaMek organization is a non-profit group of volunteers From 82c302a6b9818fb1addb25b123f9a06c1d3e8632 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 14:53:03 -0400 Subject: [PATCH 04/15] Furhter improvements --- data/randomEvents/PrisonerMajorEventData.yml | 14 +++++++++++++- data/randomEvents/PrisonerMinorEventData.yml | 5 ++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index d88e322dbe..a40432d194 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -44,6 +44,8 @@ events: # The effects caused by failing to resolve the event successfully. effectsFailure: - effect: ESCAPE_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -95,6 +97,8 @@ events: - quality: RESPONSE_NEGATIVE effectsSuccess: - effect: ESCAPE_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: PRISONER_CAPACITY magnitude: -10 @@ -257,6 +261,8 @@ events: - PRISONERS magnitude: 10 - effect: ESCAPE_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -274,6 +280,8 @@ events: - PRISONERS magnitude: 20 - effect: ESCAPE_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -335,6 +343,8 @@ events: - PRISONERS magnitude: 40 - effect: ESCAPE_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -356,6 +366,8 @@ events: - PRISONERS magnitude: 40 - effect: ESCAPE_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 20 - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -434,7 +446,7 @@ events: - COMBAT_PERSONNEL - SUPPORT_PERSONNEL # Magnitude 2, as the problem wasn't resolved - magnitude: 1 + magnitude: 2 - prisonerEvent: HOSTAGE responseEntries: diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index 722115084d..6837db4cfa 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -192,11 +192,15 @@ events: - effect: PRISONER_CAPACITY magnitude: 5 - effect: INJURY_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 5 effectsFailure: - effect: PRISONER_CAPACITY magnitude: -15 - effect: INJURY_PERCENT + affectedPersonnelTypes: + - PRISONERS magnitude: 5 - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -728,7 +732,6 @@ events: magnitude: -5 - quality: RESPONSE_NEUTRAL effectsSuccess: - - effect: NONE - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: From b98d69050db9d8ab3b781dbc558b5a92c590311b Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 15:01:28 -0400 Subject: [PATCH 05/15] Fixed YML reading --- data/randomEvents/PrisonerMajorEventData.yml | 22 ++-- data/randomEvents/PrisonerMinorEventData.yml | 102 +++++++++---------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index a40432d194..75d392d608 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -18,8 +18,8 @@ # All events in this yml are considered 'minor' events events: # This is the internal identification enum for the event. - # Only acceptable values are in the PrisonerEvent enum. - - prisonerEvent: BREAKOUT + # Only acceptable values are in the RandomEventType enum. + - randomEventType: BREAKOUT responseEntries: # Can only include values from the ResponseQuality enum. Must include three responses whose # index matches the response options presented to the player. @@ -108,7 +108,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - - prisonerEvent: RIOT + - randomEventType: RIOT responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -192,7 +192,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - - prisonerEvent: MURDER + - randomEventType: MURDER responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -248,7 +248,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - - prisonerEvent: FIRE + - randomEventType: FIRE responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -380,7 +380,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - - prisonerEvent: POISON + - randomEventType: POISON responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -448,7 +448,7 @@ events: # Magnitude 2, as the problem wasn't resolved magnitude: 2 - - prisonerEvent: HOSTAGE + - randomEventType: HOSTAGE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -550,7 +550,7 @@ events: - SECURITY_GUARD magnitude: 10 - - prisonerEvent: BOMB + - randomEventType: BOMB responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -596,7 +596,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - - prisonerEvent: EXECUTION + - randomEventType: EXECUTION responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -658,7 +658,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: ABANDONED_TO_DIE + - randomEventType: ABANDONED_TO_DIE responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -706,7 +706,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: UNITED + - randomEventType: UNITED responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index 6837db4cfa..eadc3157e9 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -18,8 +18,8 @@ # All events in this yml are considered 'minor' events events: # This is the internal identification enum for the event. - # Only acceptable values are in the PrisonerEvent enum. - - prisonerEvent: ARGUMENT + # Only acceptable values are in the RandomEventType enum. + - randomEventType: ARGUMENT responseEntries: # Can only include values from the ResponseQuality enum. Must include three responses whose # index matches the response options presented to the player. @@ -67,7 +67,7 @@ events: - SECURITY_GUARD magnitude: 3 - - prisonerEvent: WILD_STORIES + - randomEventType: WILD_STORIES responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -101,7 +101,7 @@ events: magnitude: 1 skillType: S_LEADER - - prisonerEvent: TAMPERING + - randomEventType: TAMPERING responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -132,7 +132,7 @@ events: - effect: PRISONER_CAPACITY magnitude: 10 - - prisonerEvent: CONVERSATIONS + - randomEventType: CONVERSATIONS responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -161,7 +161,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: RATIONS + - randomEventType: RATIONS responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -185,7 +185,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: TRADE + - randomEventType: TRADE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -216,7 +216,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: DRAINED + - randomEventType: DRAINED responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -247,7 +247,7 @@ events: - SECURITY_GUARD magnitude: -2 - - prisonerEvent: RESCUE + - randomEventType: RESCUE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -296,7 +296,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: REPAIRS + - randomEventType: REPAIRS responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -339,7 +339,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: SICKNESS + - randomEventType: SICKNESS responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -371,7 +371,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: VETERAN + - randomEventType: VETERAN responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -400,7 +400,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: GRAFFITI + - randomEventType: GRAFFITI responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -429,7 +429,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: PRAYER + - randomEventType: PRAYER responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -451,7 +451,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: BARTERING + - randomEventType: BARTERING responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -473,7 +473,7 @@ events: # The OpFor has their morale bumped by one level - effect: UNIQUE - - prisonerEvent: OFFICER + - randomEventType: OFFICER responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -527,7 +527,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: DICE + - randomEventType: DICE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -555,7 +555,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: LOVERS + - randomEventType: LOVERS responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -578,7 +578,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: SOBBING + - randomEventType: SOBBING responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -606,7 +606,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: PROPAGANDA + - randomEventType: PROPAGANDA responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -630,7 +630,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: SONGS + - randomEventType: SONGS responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -654,7 +654,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: REFUSE_RATIONS + - randomEventType: REFUSE_RATIONS responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -688,7 +688,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: PLOTTING + - randomEventType: PLOTTING responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -722,7 +722,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: EQUIPMENT + - randomEventType: EQUIPMENT responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -745,7 +745,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: PLANNED_RESCUE + - randomEventType: PLANNED_RESCUE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -777,7 +777,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: MISTAKE + - randomEventType: MISTAKE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -804,7 +804,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: LETTER + - randomEventType: LETTER responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -827,7 +827,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: ILLNESS + - randomEventType: ILLNESS responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -865,7 +865,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: DO_ANDROIDS_DREAM_OF_ELECTRONIC_SHEEP + - randomEventType: DO_ANDROIDS_DREAM_OF_ELECTRONIC_SHEEP responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -888,7 +888,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: HEAVY_METAL + - randomEventType: HEAVY_METAL responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -911,7 +911,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: PARANOIA + - randomEventType: PARANOIA responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -932,7 +932,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: TUNNEL + - randomEventType: TUNNEL responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -979,7 +979,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: PET_RODENT + - randomEventType: PET_RODENT responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1001,7 +1001,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: ESCAPE_ROPE + - randomEventType: ESCAPE_ROPE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1048,7 +1048,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: UNDERCOVER + - randomEventType: UNDERCOVER responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1081,7 +1081,7 @@ events: - effect: SUPPORT_POINT magnitude: -1 - - prisonerEvent: BRAND + - randomEventType: BRAND responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1127,7 +1127,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: SILENCE + - randomEventType: SILENCE responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1150,7 +1150,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: SINGING + - randomEventType: SINGING responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1174,7 +1174,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: PAPER + - randomEventType: PAPER responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1198,7 +1198,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: HOLIDAY + - randomEventType: HOLIDAY responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -1221,7 +1221,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: WHISPERS + - randomEventType: WHISPERS responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1243,7 +1243,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: LEADER + - randomEventType: LEADER responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1292,7 +1292,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: ARGUMENTS + - randomEventType: ARGUMENTS responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1314,7 +1314,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: SENTIMENTAL_ITEM + - randomEventType: SENTIMENTAL_ITEM responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1337,7 +1337,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - - prisonerEvent: MALNUTRITION + - randomEventType: MALNUTRITION responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1368,7 +1368,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: INJURIES + - randomEventType: INJURIES responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1422,7 +1422,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: TERROR + - randomEventType: TERROR responseEntries: - quality: RESPONSE_NEGATIVE effectsSuccess: @@ -1447,7 +1447,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: SCREAMING + - randomEventType: SCREAMING responseEntries: - quality: RESPONSE_NEUTRAL effectsSuccess: @@ -1470,7 +1470,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: PHOTO + - randomEventType: PHOTO responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1495,7 +1495,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - - prisonerEvent: GHOSTS + - randomEventType: GHOSTS responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: @@ -1518,7 +1518,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - - prisonerEvent: VOICES + - randomEventType: VOICES responseEntries: - quality: RESPONSE_POSITIVE effectsSuccess: From f5ab7e256487d4931a81f1dd21538376f6ddf31a Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 16:12:47 -0400 Subject: [PATCH 06/15] Renamed ATTRIBUTE_NONE --- data/randomEvents/PrisonerMajorEventData.yml | 6 +- data/randomEvents/PrisonerMinorEventData.yml | 58 ++++++++++---------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index 75d392d608..6e732ca30c 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -24,6 +24,10 @@ events: # Can only include values from the ResponseQuality enum. Must include three responses whose # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL + # Can only include skill values from the SkillType class. Defaults to "", if not present. + skillCheckType: "" + # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. + abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. effectsSuccess: # Can only include values from the EventResultEffect enum. @@ -38,7 +42,7 @@ events: magnitude: 20 # Can only include skill values from the SkillType class. Used by the 'SKILL' # EventResultEffect. Defaults to "", if not present. - skillType: SKILL_NONE + affectedSkill: "" - effect: PRISONER_CAPACITY magnitude: -25 # The effects caused by failing to resolve the event successfully. diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index eadc3157e9..8578fab0f8 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -39,7 +39,7 @@ events: magnitude: 5 # Can only include skill values from the SkillType class. Used by the 'SKILL' # EventResultEffect. Defaults to "", if not present. - skillType: SKILL_NONE + affectedSkill: "" # The effects caused by failing to resolve the event successfully. effectsFailure: - effect: PRISONER_CAPACITY @@ -87,7 +87,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - quality: RESPONSE_NEUTRAL effectsSuccess: - effect: PRISONER_CAPACITY @@ -99,7 +99,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - randomEventType: TAMPERING responseEntries: @@ -255,7 +255,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -263,7 +263,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL @@ -272,7 +272,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -280,7 +280,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 2 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE @@ -292,7 +292,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -10 @@ -304,13 +304,13 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_TECH_MECHANIC + affectedSkill: S_TECH_MECHANIC effectsFailure: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_TECH_MECHANIC + affectedSkill: S_TECH_MECHANIC - effect: PRISONER_CAPACITY magnitude: -20 - quality: RESPONSE_NEUTRAL @@ -319,13 +319,13 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_TECH_MECHANIC + affectedSkill: S_TECH_MECHANIC effectsFailure: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_TECH_MECHANIC + affectedSkill: S_TECH_MECHANIC - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE @@ -334,7 +334,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_TECH_MECHANIC + affectedSkill: S_TECH_MECHANIC effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 @@ -422,7 +422,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -481,7 +481,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -489,7 +489,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL @@ -498,7 +498,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: @@ -506,7 +506,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE @@ -515,7 +515,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: @@ -523,7 +523,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 @@ -669,7 +669,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -677,7 +677,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE @@ -703,7 +703,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -711,7 +711,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE @@ -1251,7 +1251,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER effectsFailure: - effect: INJURY affectedPersonnelTypes: @@ -1265,7 +1265,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: 10 effectsFailure: @@ -1273,7 +1273,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL @@ -1282,13 +1282,13 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER effectsFailure: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - skillType: S_LEADER + affectedSkill: S_LEADER - effect: PRISONER_CAPACITY magnitude: -10 From 8df491575730519f98216bccddbad82e5e14b8eb Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 17:14:38 -0400 Subject: [PATCH 07/15] Added skill checks --- data/randomEvents/PrisonerMajorEventData.yml | 29 ++++++- data/randomEvents/PrisonerMinorEventData.yml | 83 ++++++++++++++++++++ 2 files changed, 111 insertions(+), 1 deletion(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index 6e732ca30c..cd261b5639 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -25,7 +25,7 @@ events: # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL # Can only include skill values from the SkillType class. Defaults to "", if not present. - skillCheckType: "" + skillCheckType: S_SMALL_ARMS # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. @@ -66,6 +66,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -99,6 +100,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: ESCAPE_PERCENT affectedPersonnelTypes: @@ -115,6 +117,7 @@ events: - randomEventType: RIOT responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -142,6 +145,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -173,6 +177,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE + skillCheckType: S_NEG effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -199,6 +204,7 @@ events: - randomEventType: MURDER responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -214,6 +220,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE + skillCheckType: S_ACTING effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -229,6 +236,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -255,6 +263,7 @@ events: - randomEventType: FIRE responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_ADMIN effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -298,6 +307,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -337,6 +347,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -387,6 +398,7 @@ events: - randomEventType: POISON responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -405,6 +417,7 @@ events: # Magnitude 2, as the problem wasn't resolved magnitude: 2 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -434,6 +447,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -455,6 +469,7 @@ events: - randomEventType: HOSTAGE responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_ACTING effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -490,6 +505,7 @@ events: - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -529,6 +545,7 @@ events: - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE + skillCheckType: S_LEADER effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -10 @@ -557,6 +574,7 @@ events: - randomEventType: BOMB responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: ESCAPE magnitude: 10 @@ -568,6 +586,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -585,6 +604,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -603,6 +623,7 @@ events: - randomEventType: EXECUTION responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -628,6 +649,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -665,6 +687,7 @@ events: - randomEventType: ABANDONED_TO_DIE responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_ADMIN effectsSuccess: # Generate 2d6 new prisoners & xd6 crime - effect: UNIQUE @@ -695,6 +718,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEGATIVE + skillCheckType: S_NEG effectsSuccess: # Generate 2d6 new prisoners & xd6 crime - effect: UNIQUE @@ -713,6 +737,7 @@ events: - randomEventType: UNITED responseEntries: - quality: RESPONSE_NEGATIVE + skillCheckType: S_INTEREST_MILITARY effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -740,6 +765,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -779,6 +805,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index 8578fab0f8..ef20dd4716 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -24,6 +24,10 @@ events: # Can only include values from the ResponseQuality enum. Must include three responses whose # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL + # Can only include skill values from the SkillType class. Defaults to "", if not present. + skillCheckType: S_SMALL_ARMS + # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. + abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. effectsSuccess: # Can only include values from the EventResultEffect enum. @@ -77,6 +81,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -89,6 +94,7 @@ events: magnitude: 1 affectedSkill: S_LEADER - quality: RESPONSE_NEUTRAL + skillCheckType: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -104,6 +110,7 @@ events: - randomEventType: TAMPERING responseEntries: - quality: RESPONSE_NEGATIVE + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -135,12 +142,14 @@ events: - randomEventType: CONVERSATIONS responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_CRYPTOGRAPHY effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INTERROGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -178,6 +187,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -188,6 +198,7 @@ events: - randomEventType: TRADE responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -219,12 +230,14 @@ events: - randomEventType: DRAINED responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE + skillCheckType: S_LEADER effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -267,6 +280,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_NEG effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -299,6 +313,7 @@ events: - randomEventType: REPAIRS responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_PERCEPTION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -329,6 +344,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE + skillCheckType: S_TECH_MECHANIC effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -342,6 +358,7 @@ events: - randomEventType: SICKNESS responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -388,12 +405,14 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE + skillCheckType: S_NEG effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -417,6 +436,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -438,6 +458,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -454,12 +475,14 @@ events: - randomEventType: BARTERING responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INTERROGATION effectsSuccess: - effect: NONE effectsFailure: @@ -510,6 +533,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE + skillCheckType: S_INTEREST_POLITICS effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -558,6 +582,7 @@ events: - randomEventType: LOVERS responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_LEADER effectsSuccess: - effect: NONE effectsFailure: @@ -566,12 +591,14 @@ events: - SECURITY_GUARD magnitude: -3 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: NONE effectsFailure: @@ -595,6 +622,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -616,6 +644,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -647,6 +676,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ART_SINGING effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -664,6 +694,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE + skillCheckType: S_NEG effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -681,6 +712,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -691,6 +723,7 @@ events: - randomEventType: PLOTTING responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -698,6 +731,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE + skillCheckType: S_INTERROGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -725,12 +759,14 @@ events: - randomEventType: EQUIPMENT responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ASTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -738,6 +774,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -748,6 +785,7 @@ events: - randomEventType: PLANNED_RESCUE responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -755,6 +793,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INTERROGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -770,6 +809,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -786,6 +826,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: # Remove all combat skills from a random Prisoner - effect: UNIQUE @@ -807,6 +848,7 @@ events: - randomEventType: LETTER responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -820,6 +862,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -15 @@ -830,6 +873,7 @@ events: - randomEventType: ILLNESS responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -858,6 +902,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_POSITIVE + skillCheckType: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -874,6 +919,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -891,6 +937,7 @@ events: - randomEventType: HEAVY_METAL responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -10 @@ -904,6 +951,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_TRACKING effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -914,6 +962,7 @@ events: - randomEventType: PARANOIA responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -935,12 +984,14 @@ events: - randomEventType: TUNNEL responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE + skillCheckType: S_INTERROGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -972,6 +1023,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_STEALTH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -989,12 +1041,14 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ANIMAL_HANDLING effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -1004,6 +1058,7 @@ events: - randomEventType: ESCAPE_ROPE responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1035,6 +1090,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_LEADER effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1051,6 +1107,7 @@ events: - randomEventType: UNDERCOVER responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_ADMIN effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE @@ -1070,6 +1127,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INTERROGATION effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE @@ -1084,6 +1142,7 @@ events: - randomEventType: BRAND responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: LOYALTY_ONE affectedPersonnelTypes: @@ -1099,6 +1158,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE + skillCheckType: S_MEDTECH effectsSuccess: - effect: LOYALTY_ONE affectedPersonnelTypes: @@ -1130,6 +1190,7 @@ events: - randomEventType: SILENCE responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1144,6 +1205,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEUTRAL + skillCheckType: S_SECURITY_SYSTEMS_ELECTRONIC effectsSuccess: - effect: NONE effectsFailure: @@ -1160,6 +1222,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1167,6 +1230,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -1177,6 +1241,7 @@ events: - randomEventType: PAPER responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1201,6 +1266,7 @@ events: - randomEventType: HOLIDAY responseEntries: - quality: RESPONSE_NEGATIVE + skillCheckType: S_SMALL_ARMS effectsSuccess: - effect: NONE effectsFailure: @@ -1214,6 +1280,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_ACTING effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1230,6 +1297,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_SENSOR_OPERATIONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1246,6 +1314,7 @@ events: - randomEventType: LEADER responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_INTERROGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -1260,6 +1329,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -1295,6 +1365,7 @@ events: - randomEventType: ARGUMENTS responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1302,6 +1373,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -1330,6 +1402,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1340,6 +1413,7 @@ events: - randomEventType: MALNUTRITION responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_MELEE_WEAPONS effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1371,6 +1445,7 @@ events: - randomEventType: INJURIES responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_INVESTIGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1409,6 +1484,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1431,6 +1507,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE + skillCheckType: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1438,6 +1515,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_INTERROGATION effectsSuccess: - effect: SUPPORT_POINT magnitude: 1 @@ -1450,6 +1528,7 @@ events: - randomEventType: SCREAMING responseEntries: - quality: RESPONSE_NEUTRAL + skillCheckType: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1473,6 +1552,7 @@ events: - randomEventType: PHOTO responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1486,6 +1566,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE + skillCheckType: S_NEG effectsSuccess: - effect: SUPPORT_POINT magnitude: 1 @@ -1498,6 +1579,7 @@ events: - randomEventType: GHOSTS responseEntries: - quality: RESPONSE_POSITIVE + skillCheckType: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1535,6 +1617,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEUTRAL + skillCheckType: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: From 97acea64b6f288cb9a4903d03fbb889b54fa6821 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 20:32:12 -0400 Subject: [PATCH 08/15] Added skill checks --- data/randomEvents/PrisonerMajorEventData.yml | 56 +++---- data/randomEvents/PrisonerMinorEventData.yml | 160 +++++++++---------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index cd261b5639..7c3111fd68 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -25,7 +25,7 @@ events: # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL # Can only include skill values from the SkillType class. Defaults to "", if not present. - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. @@ -66,7 +66,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -100,7 +100,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: ESCAPE_PERCENT affectedPersonnelTypes: @@ -117,7 +117,7 @@ events: - randomEventType: RIOT responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -145,7 +145,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -177,7 +177,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -204,7 +204,7 @@ events: - randomEventType: MURDER responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -220,7 +220,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE - skillCheckType: S_ACTING + skillCheckSkill: S_ACTING effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -236,7 +236,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -263,7 +263,7 @@ events: - randomEventType: FIRE responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -307,7 +307,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -347,7 +347,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -398,7 +398,7 @@ events: - randomEventType: POISON responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -417,7 +417,7 @@ events: # Magnitude 2, as the problem wasn't resolved magnitude: 2 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -447,7 +447,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -469,7 +469,7 @@ events: - randomEventType: HOSTAGE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_ACTING + skillCheckSkill: S_ACTING effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -505,7 +505,7 @@ events: - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -545,7 +545,7 @@ events: - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE - skillCheckType: S_LEADER + skillCheckSkill: S_LEADER effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -10 @@ -574,7 +574,7 @@ events: - randomEventType: BOMB responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: ESCAPE magnitude: 10 @@ -586,7 +586,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -604,7 +604,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -623,7 +623,7 @@ events: - randomEventType: EXECUTION responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -649,7 +649,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -687,7 +687,7 @@ events: - randomEventType: ABANDONED_TO_DIE responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: # Generate 2d6 new prisoners & xd6 crime - effect: UNIQUE @@ -718,7 +718,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEGATIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: # Generate 2d6 new prisoners & xd6 crime - effect: UNIQUE @@ -737,7 +737,7 @@ events: - randomEventType: UNITED responseEntries: - quality: RESPONSE_NEGATIVE - skillCheckType: S_INTEREST_MILITARY + skillCheckSkill: S_INTEREST_MILITARY effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -765,7 +765,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -805,7 +805,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index ef20dd4716..cab0ba69cb 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -25,7 +25,7 @@ events: # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL # Can only include skill values from the SkillType class. Defaults to "", if not present. - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. @@ -81,7 +81,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -94,7 +94,7 @@ events: magnitude: 1 affectedSkill: S_LEADER - quality: RESPONSE_NEUTRAL - skillCheckType: S_CRYPTOGRAPHY + skillCheckSkill: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -110,7 +110,7 @@ events: - randomEventType: TAMPERING responseEntries: - quality: RESPONSE_NEGATIVE - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -142,14 +142,14 @@ events: - randomEventType: CONVERSATIONS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_CRYPTOGRAPHY + skillCheckSkill: S_CRYPTOGRAPHY effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -187,7 +187,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -198,7 +198,7 @@ events: - randomEventType: TRADE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -230,14 +230,14 @@ events: - randomEventType: DRAINED responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckType: S_LEADER + skillCheckSkill: S_LEADER effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -280,7 +280,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -313,7 +313,7 @@ events: - randomEventType: REPAIRS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_PERCEPTION + skillCheckSkill: S_PERCEPTION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -344,7 +344,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckType: S_TECH_MECHANIC + skillCheckSkill: S_TECH_MECHANIC effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -358,7 +358,7 @@ events: - randomEventType: SICKNESS responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_MEDTECH + skillCheckSkill: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -405,14 +405,14 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -436,7 +436,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -458,7 +458,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -475,14 +475,14 @@ events: - randomEventType: BARTERING responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: NONE effectsFailure: @@ -533,7 +533,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE - skillCheckType: S_INTEREST_POLITICS + skillCheckSkill: S_INTEREST_POLITICS effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -582,7 +582,7 @@ events: - randomEventType: LOVERS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_LEADER + skillCheckSkill: S_LEADER effectsSuccess: - effect: NONE effectsFailure: @@ -591,14 +591,14 @@ events: - SECURITY_GUARD magnitude: -3 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: NONE effectsFailure: @@ -622,7 +622,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -644,7 +644,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -676,7 +676,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ART_SINGING + skillCheckSkill: S_ART_SINGING effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -694,7 +694,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -712,7 +712,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -723,7 +723,7 @@ events: - randomEventType: PLOTTING responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -731,7 +731,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -759,14 +759,14 @@ events: - randomEventType: EQUIPMENT responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ASTECH + skillCheckSkill: S_ASTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -774,7 +774,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -785,7 +785,7 @@ events: - randomEventType: PLANNED_RESCUE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -793,7 +793,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -809,7 +809,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -826,7 +826,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: # Remove all combat skills from a random Prisoner - effect: UNIQUE @@ -848,7 +848,7 @@ events: - randomEventType: LETTER responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_CRYPTOGRAPHY + skillCheckSkill: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -862,7 +862,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -15 @@ -873,7 +873,7 @@ events: - randomEventType: ILLNESS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -902,7 +902,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_POSITIVE - skillCheckType: S_MEDTECH + skillCheckSkill: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -919,7 +919,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -937,7 +937,7 @@ events: - randomEventType: HEAVY_METAL responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -10 @@ -951,7 +951,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_TRACKING + skillCheckSkill: S_TRACKING effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -962,7 +962,7 @@ events: - randomEventType: PARANOIA responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -984,14 +984,14 @@ events: - randomEventType: TUNNEL responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1023,7 +1023,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_STEALTH + skillCheckSkill: S_STEALTH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1041,14 +1041,14 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ANIMAL_HANDLING + skillCheckSkill: S_ANIMAL_HANDLING effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -1058,7 +1058,7 @@ events: - randomEventType: ESCAPE_ROPE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1090,7 +1090,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_LEADER + skillCheckSkill: S_LEADER effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1107,7 +1107,7 @@ events: - randomEventType: UNDERCOVER responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE @@ -1127,7 +1127,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE @@ -1142,7 +1142,7 @@ events: - randomEventType: BRAND responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: LOYALTY_ONE affectedPersonnelTypes: @@ -1158,7 +1158,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckType: S_MEDTECH + skillCheckSkill: S_MEDTECH effectsSuccess: - effect: LOYALTY_ONE affectedPersonnelTypes: @@ -1190,7 +1190,7 @@ events: - randomEventType: SILENCE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1205,7 +1205,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEUTRAL - skillCheckType: S_SECURITY_SYSTEMS_ELECTRONIC + skillCheckSkill: S_SECURITY_SYSTEMS_ELECTRONIC effectsSuccess: - effect: NONE effectsFailure: @@ -1222,7 +1222,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1230,7 +1230,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_CRYPTOGRAPHY + skillCheckSkill: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -1241,7 +1241,7 @@ events: - randomEventType: PAPER responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_CRYPTOGRAPHY + skillCheckSkill: S_CRYPTOGRAPHY effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1266,7 +1266,7 @@ events: - randomEventType: HOLIDAY responseEntries: - quality: RESPONSE_NEGATIVE - skillCheckType: S_SMALL_ARMS + skillCheckSkill: S_SMALL_ARMS effectsSuccess: - effect: NONE effectsFailure: @@ -1280,7 +1280,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_ACTING + skillCheckSkill: S_ACTING effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1297,7 +1297,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_SENSOR_OPERATIONS + skillCheckSkill: S_SENSOR_OPERATIONS effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1314,7 +1314,7 @@ events: - randomEventType: LEADER responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -1329,7 +1329,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: SKILL affectedPersonnelTypes: @@ -1365,7 +1365,7 @@ events: - randomEventType: ARGUMENTS responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1373,7 +1373,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: @@ -1402,7 +1402,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1413,7 +1413,7 @@ events: - randomEventType: MALNUTRITION responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_MELEE_WEAPONS + skillCheckSkill: S_MELEE_WEAPONS effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1445,7 +1445,7 @@ events: - randomEventType: INJURIES responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_INVESTIGATION + skillCheckSkill: S_INVESTIGATION effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1484,7 +1484,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1507,7 +1507,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1515,7 +1515,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_INTERROGATION + skillCheckSkill: S_INTERROGATION effectsSuccess: - effect: SUPPORT_POINT magnitude: 1 @@ -1528,7 +1528,7 @@ events: - randomEventType: SCREAMING responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckType: S_MEDTECH + skillCheckSkill: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1552,7 +1552,7 @@ events: - randomEventType: PHOTO responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1566,7 +1566,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckType: S_NEG + skillCheckSkill: S_NEG effectsSuccess: - effect: SUPPORT_POINT magnitude: 1 @@ -1579,7 +1579,7 @@ events: - randomEventType: GHOSTS responseEntries: - quality: RESPONSE_POSITIVE - skillCheckType: S_MEDTECH + skillCheckSkill: S_MEDTECH effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1617,7 +1617,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEUTRAL - skillCheckType: S_ADMIN + skillCheckSkill: S_ADMIN effectsSuccess: - effect: NONE effectsFailure: From 5d475d735ee6a0b0e7976151ab743614b069bc31 Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Mon, 22 Jun 2026 21:32:27 -0400 Subject: [PATCH 09/15] More work --- data/randomEvents/PrisonerMajorEventData.yml | 56 ++--- data/randomEvents/PrisonerMinorEventData.yml | 216 +++++++++---------- 2 files changed, 136 insertions(+), 136 deletions(-) diff --git a/data/randomEvents/PrisonerMajorEventData.yml b/data/randomEvents/PrisonerMajorEventData.yml index 7c3111fd68..73b0a57b82 100644 --- a/data/randomEvents/PrisonerMajorEventData.yml +++ b/data/randomEvents/PrisonerMajorEventData.yml @@ -25,7 +25,7 @@ events: # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL # Can only include skill values from the SkillType class. Defaults to "", if not present. - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. @@ -66,7 +66,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -100,7 +100,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: ESCAPE_PERCENT affectedPersonnelTypes: @@ -117,7 +117,7 @@ events: - randomEventType: RIOT responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -145,7 +145,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -177,7 +177,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -204,7 +204,7 @@ events: - randomEventType: MURDER responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -220,7 +220,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_ACTING + skillCheckSkill: Acting effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -236,7 +236,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -263,7 +263,7 @@ events: - randomEventType: FIRE responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -307,7 +307,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -347,7 +347,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -50 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -398,7 +398,7 @@ events: - randomEventType: POISON responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -417,7 +417,7 @@ events: # Magnitude 2, as the problem wasn't resolved magnitude: 2 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -447,7 +447,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: # 'Poison' (xd6 Fatigue) 10% of personnel - effect: UNIQUE @@ -469,7 +469,7 @@ events: - randomEventType: HOSTAGE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ACTING + skillCheckSkill: Acting effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -505,7 +505,7 @@ events: - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -545,7 +545,7 @@ events: - SECURITY_GUARD magnitude: 10 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_LEADER + skillCheckSkill: Leadership effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -10 @@ -574,7 +574,7 @@ events: - randomEventType: BOMB responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: ESCAPE magnitude: 10 @@ -586,7 +586,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -604,7 +604,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -623,7 +623,7 @@ events: - randomEventType: EXECUTION responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -649,7 +649,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -25 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: DEATH affectedPersonnelTypes: @@ -687,7 +687,7 @@ events: - randomEventType: ABANDONED_TO_DIE responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: # Generate 2d6 new prisoners & xd6 crime - effect: UNIQUE @@ -718,7 +718,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: # Generate 2d6 new prisoners & xd6 crime - effect: UNIQUE @@ -737,7 +737,7 @@ events: - randomEventType: UNITED responseEntries: - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_INTEREST_MILITARY + skillCheckSkill: Interest/Military effectsSuccess: - effect: INJURY_PERCENT affectedPersonnelTypes: @@ -765,7 +765,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: @@ -805,7 +805,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: DEATH_PERCENT affectedPersonnelTypes: diff --git a/data/randomEvents/PrisonerMinorEventData.yml b/data/randomEvents/PrisonerMinorEventData.yml index cab0ba69cb..5651fa81ae 100644 --- a/data/randomEvents/PrisonerMinorEventData.yml +++ b/data/randomEvents/PrisonerMinorEventData.yml @@ -25,7 +25,7 @@ events: # index matches the response options presented to the player. - quality: RESPONSE_NEUTRAL # Can only include skill values from the SkillType class. Defaults to "", if not present. - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms # Can only include values from the SkillAttribute class. Defaults to "ATTRIBUTE_NONE", if not present. abilityCheckType: ATTRIBUTE_NONE # The effects caused by successfully resolving the event. @@ -81,7 +81,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -92,9 +92,9 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_CRYPTOGRAPHY + skillCheckSkill: Cryptography effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -105,12 +105,12 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - randomEventType: TAMPERING responseEntries: - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -142,14 +142,14 @@ events: - randomEventType: CONVERSATIONS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_CRYPTOGRAPHY + skillCheckSkill: Cryptography effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -187,7 +187,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -198,7 +198,7 @@ events: - randomEventType: TRADE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -230,14 +230,14 @@ events: - randomEventType: DRAINED responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_LEADER + skillCheckSkill: Leadership effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -268,7 +268,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -276,17 +276,17 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -294,7 +294,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 2 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE @@ -306,26 +306,26 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -10 - randomEventType: REPAIRS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_PERCEPTION + skillCheckSkill: Perception effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_TECH_MECHANIC + affectedSkill: Tech/Mechanic effectsFailure: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_TECH_MECHANIC + affectedSkill: Tech/Mechanic - effect: PRISONER_CAPACITY magnitude: -20 - quality: RESPONSE_NEUTRAL @@ -334,23 +334,23 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_TECH_MECHANIC + affectedSkill: Tech/Mechanic effectsFailure: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_TECH_MECHANIC + affectedSkill: Tech/Mechanic - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_TECH_MECHANIC + skillCheckSkill: Tech/Mechanic effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_TECH_MECHANIC + affectedSkill: Tech/Mechanic effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 @@ -358,7 +358,7 @@ events: - randomEventType: SICKNESS responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_MEDTECH + skillCheckSkill: MedTech/Any effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -405,14 +405,14 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: @@ -436,13 +436,13 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -458,7 +458,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -475,14 +475,14 @@ events: - randomEventType: BARTERING responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: NONE effectsFailure: @@ -504,7 +504,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -512,7 +512,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL @@ -521,7 +521,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: @@ -529,17 +529,17 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_INTEREST_POLITICS + skillCheckSkill: Interest/Politics effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 effectsFailure: @@ -547,7 +547,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 @@ -582,7 +582,7 @@ events: - randomEventType: LOVERS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_LEADER + skillCheckSkill: Leadership effectsSuccess: - effect: NONE effectsFailure: @@ -591,14 +591,14 @@ events: - SECURITY_GUARD magnitude: -3 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: NONE effectsFailure: @@ -622,7 +622,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -644,7 +644,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -676,7 +676,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ART_SINGING + skillCheckSkill: Art/Singing effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -694,13 +694,13 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -708,11 +708,11 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -723,7 +723,7 @@ events: - randomEventType: PLOTTING responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -731,13 +731,13 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 5 effectsFailure: @@ -745,7 +745,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 1 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE @@ -759,14 +759,14 @@ events: - randomEventType: EQUIPMENT responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ASTECH + skillCheckSkill: Astech effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -774,7 +774,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -785,7 +785,7 @@ events: - randomEventType: PLANNED_RESCUE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -793,7 +793,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -809,7 +809,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -826,7 +826,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: # Remove all combat skills from a random Prisoner - effect: UNIQUE @@ -848,7 +848,7 @@ events: - randomEventType: LETTER responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_CRYPTOGRAPHY + skillCheckSkill: Cryptography effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -862,7 +862,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -15 @@ -873,7 +873,7 @@ events: - randomEventType: ILLNESS responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: @@ -902,7 +902,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_MEDTECH + skillCheckSkill: MedTech/Any effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 10 @@ -919,7 +919,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -937,7 +937,7 @@ events: - randomEventType: HEAVY_METAL responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -10 @@ -951,7 +951,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_TRACKING + skillCheckSkill: Tracking/Any effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -962,7 +962,7 @@ events: - randomEventType: PARANOIA responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: @@ -984,14 +984,14 @@ events: - randomEventType: TUNNEL responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1023,7 +1023,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_STEALTH + skillCheckSkill: Stealth effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1041,14 +1041,14 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ANIMAL_HANDLING + skillCheckSkill: Animal Handling effectsSuccess: - effect: NONE effectsFailure: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: @@ -1058,7 +1058,7 @@ events: - randomEventType: ESCAPE_ROPE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1090,7 +1090,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_LEADER + skillCheckSkill: Leadership effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1107,7 +1107,7 @@ events: - randomEventType: UNDERCOVER responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE @@ -1127,7 +1127,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: # Change the origin faction of one prisoner to match employer - effect: UNIQUE @@ -1142,7 +1142,7 @@ events: - randomEventType: BRAND responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: LOYALTY_ONE affectedPersonnelTypes: @@ -1158,7 +1158,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_MEDTECH + skillCheckSkill: MedTech/Any effectsSuccess: - effect: LOYALTY_ONE affectedPersonnelTypes: @@ -1190,7 +1190,7 @@ events: - randomEventType: SILENCE responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1205,7 +1205,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_SECURITY_SYSTEMS_ELECTRONIC + skillCheckSkill: Security Systems/Electronic effectsSuccess: - effect: NONE effectsFailure: @@ -1222,7 +1222,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1230,7 +1230,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_CRYPTOGRAPHY + skillCheckSkill: Cryptography effectsSuccess: - effect: PRISONER_CAPACITY magnitude: -5 @@ -1241,7 +1241,7 @@ events: - randomEventType: PAPER responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_CRYPTOGRAPHY + skillCheckSkill: Cryptography effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1266,7 +1266,7 @@ events: - randomEventType: HOLIDAY responseEntries: - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_SMALL_ARMS + skillCheckSkill: Small Arms effectsSuccess: - effect: NONE effectsFailure: @@ -1280,7 +1280,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_ACTING + skillCheckSkill: Acting effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1297,7 +1297,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_SENSOR_OPERATIONS + skillCheckSkill: Sensor Operations effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1314,13 +1314,13 @@ events: - randomEventType: LEADER responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership effectsFailure: - effect: INJURY affectedPersonnelTypes: @@ -1329,13 +1329,13 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: 10 effectsFailure: @@ -1343,7 +1343,7 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL @@ -1352,20 +1352,20 @@ events: affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership effectsFailure: - effect: SKILL affectedPersonnelTypes: - PRISONERS magnitude: 3 - affectedSkill: S_LEADER + affectedSkill: Leadership - effect: PRISONER_CAPACITY magnitude: -10 - randomEventType: ARGUMENTS responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1373,7 +1373,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: @@ -1402,7 +1402,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1413,7 +1413,7 @@ events: - randomEventType: MALNUTRITION responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_MELEE_WEAPONS + skillCheckSkill: Melee Weapons effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1445,7 +1445,7 @@ events: - randomEventType: INJURIES responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_INVESTIGATION + skillCheckSkill: Investigation effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1484,7 +1484,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: INJURY affectedPersonnelTypes: @@ -1507,7 +1507,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -10 - quality: RESPONSE_POSITIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1515,7 +1515,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_INTERROGATION + skillCheckSkill: Interrogation effectsSuccess: - effect: SUPPORT_POINT magnitude: 1 @@ -1528,7 +1528,7 @@ events: - randomEventType: SCREAMING responseEntries: - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_MEDTECH + skillCheckSkill: MedTech/Any effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1552,7 +1552,7 @@ events: - randomEventType: PHOTO responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1566,7 +1566,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -5 - quality: RESPONSE_NEGATIVE - skillCheckSkill: S_NEG + skillCheckSkill: Negotiation effectsSuccess: - effect: SUPPORT_POINT magnitude: 1 @@ -1579,7 +1579,7 @@ events: - randomEventType: GHOSTS responseEntries: - quality: RESPONSE_POSITIVE - skillCheckSkill: S_MEDTECH + skillCheckSkill: MedTech/Any effectsSuccess: - effect: PRISONER_CAPACITY magnitude: 5 @@ -1617,7 +1617,7 @@ events: - effect: PRISONER_CAPACITY magnitude: -15 - quality: RESPONSE_NEUTRAL - skillCheckSkill: S_ADMIN + skillCheckSkill: Administration effectsSuccess: - effect: NONE effectsFailure: From ed19454734a80896aebff7f3dc8f0a237604c16f Mon Sep 17 00:00:00 2001 From: IllianiBird Date: Tue, 23 Jun 2026 12:05:52 -0400 Subject: [PATCH 10/15] Progress --- data/universe/defaultspa.xml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/data/universe/defaultspa.xml b/data/universe/defaultspa.xml index d4b87d0c49..8eeff5eb8c 100644 --- a/data/universe/defaultspa.xml +++ b/data/universe/defaultspa.xml @@ -2265,32 +2265,32 @@ While this SPA does exist in ATOW, these effects are unique to MekHQ.]]> edge_when_admin_acquire_fail_other Use Edge for Acquisition Failure (TN 2–7). - + edge_when_admin_acquire_fail_greater_than_eight Use Edge for Acquisition Failure (TN 8–10). - + edge_when_admin_acquire_fail_greater_than_eleven Use Edge for Acquisition Failure (TN 11–12). - + edge_when_salvage_accident Use Edge for Salvage Accidents. - + edge_when_escape_attempt_fail Use Edge for Escape Attempt Failure. - + edge_when_admin_fail_appraisal Use Edge for Procurement Cost Appraisal Failure. - + edge_when_commander_negotiation_fail @@ -2300,12 +2300,17 @@ While this SPA does exist in ATOW, these effects are unique to MekHQ.]]> edge_when_recon_fail Use Edge for Scouting failure. - + edge_when_training_fail Use Edge for Training Operation Failure. - + + + + edge_when_random_event_fail + Use Edge for Random Event Failure. +