From e819c8aaea237d943c573fe48672b2a2a2e46a6e Mon Sep 17 00:00:00 2001 From: IllianiCBT Date: Tue, 1 Apr 2025 18:02:13 -0500 Subject: [PATCH] Prisoners Stage Escapes when Transferred to Academies - Added a new report type for prisoner escape events during academy transfers (`prisonerEscape.text`) in `Education.properties`. --- .../mekhq/resources/Education.properties | 13 +- .../education/EducationController.java | 196 ++++++++---------- 2 files changed, 88 insertions(+), 121 deletions(-) diff --git a/MekHQ/resources/mekhq/resources/Education.properties b/MekHQ/resources/mekhq/resources/Education.properties index 7ab3c705f1d..f8c50bb8a92 100644 --- a/MekHQ/resources/mekhq/resources/Education.properties +++ b/MekHQ/resources/mekhq/resources/Education.properties @@ -11,18 +11,14 @@ distance.text=Travel Time: reeducation.text=Reeducation: reeducationNoChange.text=no change facultySkill.text=Faculty Skill: - #### Application secondApplication.text=%s has previously failed the entry exam for the %s and so their application was automatically %srejected%s. applicationFailure.text=%s has %sfailed%s the entry exam for the %s (%s vs. TN %s). - #### Payment insufficientFunds.text=Not enough funds to cover %s's tuition. payment.text=Tuition fee for %s - #### Name Conjoiner conjoinerOf.text=of - #### Academy Type typeAcademy.text=Academy typeCollege.text=College @@ -33,7 +29,6 @@ typeSchool.text=School typeSchoolBoarding.text=Boarding School typeFinishingSchool.text=Finishing School typePreparatorySchool.text=Preparatory School - #### Academy Suffix suffixTechnology.text=Technology suffixTechnologyAdvanced.text=Advanced Technology @@ -41,7 +36,6 @@ suffixScience.text=Science suffixScienceAdvanced.text=Advanced Science suffixStudies.text=Advanced Studies suffixHigherLearning.text=Higher Learning - #### Academy Prefix (Military) prefixCombinedArms.text=Combined Arms prefixCombinedForces.text=Combined Forces @@ -49,13 +43,12 @@ prefixMilitary.text=Military prefixWar.text=War prefixWarFighting.text=Advanced Warfighting prefixCombat.text=Combat - #### Travel +prisonerEscape.text=While being transferred to %s, %s %sFled Imprisonment%s. homeSchool.text=%s has begun their in-unit education. offToSchool.text=%s is now traveling to the %s, and will arrive in %s days. arrived.text=%s has arrived at campus and will begin their education tomorrow. returningFromSchool.text=%s has begun their return journey, which will take approximately %s days. Travel time will adjust if the unit is in transit. - #### Events eventDestruction.text=%s's %sacademy has been destroyed%s. Luckily, %sthey survived the attack%s. Tomorrow they will begin their journey back to the unit. eventDestructionKilled.text=%s's academy has been destroyed. Sadly, they've been missing ever since the attack. @@ -64,7 +57,6 @@ eventWarExpelled.text=%s's education has been interrupted by the outbreak of war eventTrainingAccident.text=%s has suffered a serious training accident. %s eventTrainingAccidentWounded.text=They've %sbeen hospitalized%s for %s days while they recover. eventTrainingAccidentKilled.text=Sadly, %sthey didn't survive%s. - #### Graduation (Inner Sphere) dropOut.text=%s has %sdropped out%s of their education or training. Tomorrow they will begin their journey back to the unit. dropOutHomeSchooled.text=%s has %sdropped out%s of their in-unit education or training. @@ -86,12 +78,10 @@ graduatedDoctorate.text=Doctorate bonusAdded.text=During their education or training, %s discovered a natural talent! bonusXp.text=%s learned something new (+%s XP) graduatedChild.text=%s %sgraduated%s. Tomorrow, they will begin their journey back to the unit. - #### Training Combat Teams notLearningAnything.text=%s has learned all they can from %s and %sshould be reassigned%s. learnedNewSkill.text=Thanks to the teaching of %s, %s has %simproved%s their %s to\ \ %s+. - #### Graduation Events (positive) addressEncouragement.text=during which the commencement address included words of encouragement addressFriendship.text=during which the commencement address included reflections on friendship @@ -193,7 +183,6 @@ surpriseScholarship.text=during which a surprise scholarship announcement was ma surpriseScholarshipAward.text=during which another student was awarded with a surprise scholarship surpriseSpeaker.text=during which a surprise guest speaker shared valuable life lessons surpriseStandard.text=during which they got to hold the ceremonial standard - #### Graduation Events (negative) eventAccident.text=during which there was an unexpected accident causing disruption and distress eventAirRaid.text=during which there was a significant interruption due to a false alarm in planetary defenses diff --git a/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java b/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java index 1b05c4c0008..ce0e8e89607 100644 --- a/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java +++ b/MekHQ/src/mekhq/campaign/personnel/education/EducationController.java @@ -34,6 +34,8 @@ import static mekhq.campaign.randomEvents.personalities.PersonalityController.PERSONALITY_QUIRK_CHANCE; import static mekhq.campaign.randomEvents.personalities.PersonalityController.generateAndApplyPersonalityQuirk; import static mekhq.campaign.randomEvents.personalities.PersonalityController.writePersonalityDescription; +import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG; +import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor; import java.time.DayOfWeek; import java.time.LocalDate; @@ -106,8 +108,8 @@ public static boolean makeEnrollmentCheck(Campaign campaign, Person person, Stri campaign.addReport(String.format(resources.getString("secondApplication.text"), person.getHyperlinkedFullTitle(), academyNameInSet, - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG)); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG)); return false; } @@ -131,8 +133,8 @@ public static boolean makeEnrollmentCheck(Campaign campaign, Person person, Stri campaign.addReport(String.format(resources.getString("applicationFailure.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG, academyNameInSet, roll, targetNumber)); @@ -215,7 +217,14 @@ public static void performEducationPreEnrollmentActions(Campaign campaign, Perso } // notify the user - if (academy.isHomeSchool()) { + if (person.getPrisonerStatus().isCurrentPrisoner()) { + campaign.addReport(String.format(resources.getString("prisonerEscape.text"), + person.getEduAcademyName(), + person.getFullTitle(), + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG)); + campaign.removePerson(person); + } else if (academy.isHomeSchool()) { campaign.addReport(String.format(resources.getString("homeSchool.text"), person.getHyperlinkedFullTitle())); } else { campaign.addReport(String.format(resources.getString("offToSchool.text"), @@ -818,9 +827,8 @@ private static void checkForTrainingAccidents(Campaign campaign, Academy academy processTrainingInjury(campaign, academy, person, resources); } else { String resultString = String.format(resources.getString("eventTrainingAccidentKilled.text"), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG); String reportMessage = String.format(resources.getString("eventTrainingAccident.text"), person.getHyperlinkedFullTitle(), @@ -850,8 +858,8 @@ private static void processTrainingInjury(Campaign campaign, Academy academy, Pe int roll = d6(3); String resultString = String.format(resources.getString("eventTrainingAccidentWounded.text"), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG, roll); String reportMessage = String.format(resources.getString("eventTrainingAccident.text"), @@ -923,9 +931,8 @@ private static boolean checkForDropout(Campaign campaign, Academy academy, Perso } else { String reportMessage = String.format(resources.getString("dropOutRejected.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -935,9 +942,8 @@ private static boolean checkForDropout(Campaign campaign, Academy academy, Perso // might as well scare the player String reportMessage = String.format(resources.getString("dropOutRejected.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); return true; @@ -982,7 +988,7 @@ private static void reportDropOut(Campaign campaign, Person person, Academy acad String reportText = academy.isHomeSchool() ? "dropOutHomeSchooled.text" : "dropOut.text"; String coloredOpen = String.format("", negativeHexColor); - String coloredClose = ReportingUtilities.CLOSING_SPAN_TAG; + String coloredClose = CLOSING_SPAN_TAG; String report = String.format(resources.getString(reportText), personTitle, coloredOpen, coloredClose); @@ -1004,8 +1010,8 @@ private static boolean checkForAcademyFactionConflict(Campaign campaign, Academy if (academy.isFactionConflict(campaign, person)) { String reportMessage = String.format(resources.getString("eventWarExpelled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); @@ -1029,8 +1035,8 @@ private static void checkForAcademyClosure(Campaign campaign, Academy academy, P if (campaign.getLocalDate().getYear() >= academy.getClosureYear()) { String reportMessage = String.format(resources.getString("eventClosure.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); person.setEduEducationStage(EducationStage.DROPPING_OUT); @@ -1062,12 +1068,10 @@ private static boolean checkForAcademyDestruction(Campaign campaign, Academy aca if (d6(2) >= 5) { String reportMessage = String.format(resources.getString("eventDestruction.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); @@ -1075,12 +1079,10 @@ private static boolean checkForAcademyDestruction(Campaign campaign, Academy aca } else { String reportMessage = String.format(resources.getString("eventDestructionKilled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); @@ -1089,12 +1091,10 @@ private static boolean checkForAcademyDestruction(Campaign campaign, Academy aca } else { String reportMessage = String.format(resources.getString("eventDestruction.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); @@ -1141,17 +1141,15 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedFailedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedFailed.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorNegativeHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorNegativeHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -1175,8 +1173,8 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a String reportMessage = String.format(resources.getString("graduatedClassNeeded.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG, roll); campaign.addReport(reportMessage); @@ -1191,21 +1189,18 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedTop.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG, ' ' + resources.getString(graduationEventPicker()), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -1213,21 +1208,18 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedTop.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG, "", - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -1255,21 +1247,18 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedHonors.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG, ' ' + resources.getString(graduationEventPicker()), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -1277,21 +1266,18 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedHonors.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG, "", - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -1317,17 +1303,15 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduated.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG, ' ' + resources.getString(graduationEventPicker())); campaign.addReport(reportMessage); @@ -1336,17 +1320,15 @@ private static boolean graduateAdult(Campaign campaign, Person person, Academy a if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduated.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG, + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG, ""); campaign.addReport(reportMessage); @@ -1422,9 +1404,9 @@ private static void generatePostGradGraduationReport(Campaign campaign, String p String qualification, ResourceBundle resources) { campaign.addReport(String.format(resources.getString("graduatedPostGradReport.text"), personName, - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), graduationText, - ReportingUtilities.CLOSING_SPAN_TAG, + CLOSING_SPAN_TAG, qualification)); } @@ -1459,17 +1441,15 @@ private static void graduateChild(Campaign campaign, Person person, Academy acad if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedBarelyHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedBarely.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorWarningHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorWarningHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } @@ -1477,17 +1457,15 @@ private static void graduateChild(Campaign campaign, Person person, Academy acad if (academy.isHomeSchool()) { String reportMessage = String.format(resources.getString("graduatedHomeSchooled.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); } else { String reportMessage = String.format(resources.getString("graduatedChild.text"), person.getHyperlinkedFullTitle(), - ReportingUtilities.spanOpeningWithCustomColor(MekHQ.getMHQOptions() - .getFontColorPositiveHexColor()), - ReportingUtilities.CLOSING_SPAN_TAG); + spanOpeningWithCustomColor(MekHQ.getMHQOptions().getFontColorPositiveHexColor()), + CLOSING_SPAN_TAG); campaign.addReport(reportMessage); }