Merge pull request #5101 from IllianiCBT/education_daycareDropouts

Prevented Dropout and Some Graduation Events Occurring for Very Young Children

MekHQ/src/mekhq/campaign/personnel/education/EducationController.java

@@ -672,8 +672,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?
@@ -1359,6 +1362,11 @@ private static void graduateChild(Campaign campaign, Person person, Academy acad
  graduationRoll += person.getIntelligence().ordinal() - 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"),