From e120b82be48a9e6c415f12258ffac63137eaabde Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Mon, 21 Oct 2024 12:09:33 -0500 Subject: [PATCH] Prevented Dropout and Some Graduation Events Occurring for Very Young Children Added age check to prevent dropout and 'barely' graduation events for children under 7. --- .../personnel/education/EducationController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java b/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java index cc4fc58969..a308ac2fb6 100644 --- a/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java +++ b/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java @@ -673,8 +673,11 @@ private static void processNewWeekChecks(Campaign campaign, Academy academy, Per } // does person want to drop out? - if (checkForDropout(campaign, academy, person, resources)) { - return; + // We don't process the dropout events for very young children. + if (person.getAge(campaign.getLocalDate()) > 6) { + if (checkForDropout(campaign, academy, person, resources)) { + return; + } } // was there a training accident? @@ -1360,6 +1363,11 @@ private static void graduateChild(Campaign campaign, Person person, Academy acad graduationRoll += Intelligence.parseToInt(person.getIntelligence()) - 12; } + // We don't process the granularity of graduation events for very young children. + if (person.getAge(campaign.getLocalDate()) <= 6) { + graduationRoll = 30; + } + if (graduationRoll < 30) { if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedBarelyHomeSchooled.text"),