Merge pull request #4127 from IllianiCBT/education_CrecheGraduation

Fixed Clan Creche Graduation in Education Module

Author: SJuliez

MekHQ/src/mekhq/campaign/personnel/Person.java

@@ -1050,6 +1050,7 @@ public void changeStatus(final Campaign campaign, final LocalDate today,
         this.setEduDaysOfTravelFromAcademy(0);
         this.setEduDaysOfTravel(0);
         this.setEduDaysOfEducation(0);
+        this.setEduEducationStage(0);
 
         MekHQ.triggerEvent(new PersonStatusChangedEvent(this));
     }

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

@@ -314,19 +314,19 @@ public static boolean processNewDay(Campaign campaign, Person person, boolean ag
             return false;
         }
 
-        // is person on campus and undergoing education?
-        if (educationStage == 2) {
+        // is person on campus and undergoing education, or awaiting assignment to a sibko?
+        if ((educationStage == 2) || (educationStage == 3)) {
             return ongoingEducation(campaign, person, academy, ageBypass, resources);
         }
 
         // if education has concluded and the journey home hasn't started, we begin the journey
-        if (educationStage == 3) {
+        if (educationStage == 4) {
             beginJourneyHome(campaign, person, academy, resources);
             return false;
         }
 
         // if we reach this point it means Person is already in transit, so we continue their journey
-        if (educationStage == 4) {
+        if (educationStage == 5) {
             processJourneyHome(campaign, person);
             return false;
         }
@@ -370,16 +370,17 @@ private static boolean ongoingEducation(Campaign campaign, Person person, Academ
 
         if (academy.isPrepSchool()) {
             if ((person.getAge(campaign.getLocalDate()) >= academy.getAgeMax()) || (ageBypass)) {
-                graduationPicker(campaign, person, academy, resources);
-
-                person.setEduDaysOfEducation(0);
+                if (person.getEduEducationStage() == 2) {
+                    graduationPicker(campaign, person, academy, resources);
 
-                graduation = true;
+                    person.setEduDaysOfEducation(0);
+                    person.setEduEducationStage(3);
+                } else {
+                    campaign.addReport(person.getHyperlinkedName() + ' ' + resources.getString("graduatedCreche.text"));
+                }
             }
 
-            if (campaign.getLocalDate().getDayOfWeek() == DayOfWeek.MONDAY) {
-                processNewWeekChecks(campaign, academy, person, daysOfEducation, resources);
-            }
+            graduation = true;
         } else {
             person.setEduDaysOfEducation(daysOfEducation - 1);
 
@@ -392,10 +393,12 @@ private static boolean ongoingEducation(Campaign campaign, Person person, Academ
 
                 graduation = true;
             }
+
+            person.setEduEducationStage(4);
         }
 
-        if (graduation) {
-            person.setEduDaysOfEducation(3);
+        if (campaign.getLocalDate().getDayOfWeek() == DayOfWeek.MONDAY) {
+            processNewWeekChecks(campaign, academy, person, daysOfEducation, resources);
         }
 
         return graduation;
@@ -463,7 +466,7 @@ private static void beginJourneyHome(Campaign campaign, Person person, Academy a
 
         person.setEduDaysOfTravelFromAcademy(travelTime);
         person.setEduDaysOfTravel(0);
-        person.setEduEducationStage(4);
+        person.setEduEducationStage(5);
     }
 
     /**
@@ -964,7 +967,6 @@ private static void processWarriorCasteWashout(Campaign campaign, Person person,
     private static void graduateAdult(Campaign campaign, Person person, Academy academy, ResourceBundle resources) {
         int graduationRoll = Compute.randomInt(100);
         int roll;
-        // TODO link graduation to autoAwards (this can't be done till autoAwards have been merged)
 
         // qualification failed
         if (graduationRoll < 5) {
@@ -1085,7 +1087,6 @@ private static void reportMastersOrDoctorateGain(Campaign campaign, Person perso
      */
     private static void graduateChild(Campaign campaign, Person person, Academy academy, ResourceBundle resources) {
         int graduationRoll = Compute.randomInt(100);
-        // TODO link graduation to autoAwards (this can't be done till autoAwards have been merged)
 
         // qualification failed
         if (graduationRoll < 30) {
@@ -1117,8 +1118,6 @@ private static void graduateChild(Campaign campaign, Person person, Academy acad
      * @param resources  the ResourceBundle containing localized text
      */
     private static void graduateClanCreche(Campaign campaign, Person person, Academy academy, ResourceBundle resources) {
-        // TODO link graduation to autoAwards (this can't be done till autoAwards have been merged)
-
         campaign.addReport(person.getHyperlinkedName() + ' ' + resources.getString("graduatedCreche.text"));
 
         ServiceLogger.eduClanCreche(person, campaign.getLocalDate());
@@ -1134,8 +1133,6 @@ private static void graduateClanCreche(Campaign campaign, Person person, Academy
      * @param academy the Sibko from which the person is being graduated
      */
     private static void graduateClanSibko(Campaign campaign, Person person, Academy academy, ResourceBundle resources) {
-        // TODO link graduation to autoAwards (this can't be done till autoAwards have been merged)
-
         // Warrior Caste
         // [0]MechWarrior, [1]ProtoMech, [2]AreoSpace, [3]Space, [4]BA, [5]CI, [6]Vehicle
         if (person.getEduCourseIndex() <= 6) {
@@ -1245,8 +1242,6 @@ private static void graduateWarriorCaste(Campaign campaign, Person person, Acade
      * @param resources  the resource bundle for localized messages
      */
     private static void graduateReeducationCamp(Campaign campaign, Person person, Academy academy, ResourceBundle resources) {
-        // TODO link graduation to autoAwards (this can't be done till autoAwards have been merged)
-
         // [0]Scientist Caste
         if (person.getEduCourseIndex() == 0) {
             graduateScientistCaste(campaign, person, academy, resources);