Skip to content

Commit

Permalink
Merge pull request #4605 from IllianiCBT/camOps_unitRating
Browse files Browse the repository at this point in the history
Overhauled CamOps Unit Reputation Calculations and Report
  • Loading branch information
IllianiCBT authored Aug 13, 2024
2 parents 156e2f1 + 55a2c0a commit cb75889
Show file tree
Hide file tree
Showing 31 changed files with 2,383 additions and 2,674 deletions.
57 changes: 57 additions & 0 deletions MekHQ/resources/mekhq/resources/CamOpsReputation.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
unitReputation.text=<html><font size='7'><b>Unit Reputation: %d</b></font><br><br>

averageExperienceRating.text=<b><font size='6'>Average Experience Rating: %s</font></b>
experienceLevel.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Experience Level: </b>%s<br><br>

commandRating.text=<b><font size='6'>Command Rating: %s</font></b>
leadership.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Leadership: </b>%s
tactics.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Tactics: </b>%s
strategy.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Strategy: </b>%s
negotiation.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Negotiation: </b>%s
traits.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Traits: </b>%s <i>Not Implemented</i>
personality.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Personality: </b>%s

combatRecordRating.text=<b><font size='6'>Combat Record Rating: %s</font></b>
successes.text=Successes
partialSuccesses.text=Partial Successes
failures.text=Failures
contractsBreached.text=Contracts Breached
retainerDuration.text=Retainer Duration
mission.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%s: </b>%d (+%d)

transportationRating.text=<b><font size='6'>Transportation Rating: %s</font></b>
hasJumpShipOrWarShip.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Has JumpShip or WarShip: </b>+10
smallCraft.text=Small Craft
fighters.text=Fighters
battleMechs.text=BattleMechs
vehicleSuperHeavy.text=Vehicles (Super Heavy)
vehicleHeavy.text=Vehicles (Heavy)
vehicleLight.text=Vehicles (Light)
protoMechs.text=ProtoMechs
battleArmor.text=Battle Armor
infantry.text=Infantry
transportString.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%s: </b>%d / %d Bays%s %s
asterisk.text=<br><i>* Lighter units will occupy spare bays</i><br>
noDropShip.text=No DropShip: -5
dropShipString.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;DropShips: </b>%d / %d Docking Collars (%s)<br>

supportRating.text=<br><b><font size='6'>Support Rating: %d </font></b>
crewRequirements.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Partially Crewed Large Craft: -5<br>
administrationRequirements.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Administration Requirements: </b>%d / %d (%d)<br>
technicianRequirements.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Technician Requirements: %s</b><br>
battleMechsAndProtoMechs.text=BattleMechs & ProtoMechs
vehicles.text=Vehicles
fightersAndSmallCraft.text=Fighters & Small Craft
technicianString.text=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%s: </b>%d / %d<br>

financialRating.text=<b><font size='6'>Financial Rating: %s</font></b>
hasLoanOrDebt.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Has Loan or Debt: -10</b><br><br>

crimeRating.text=<br><b><font size='6'>Crime Rating: %s</font></b>
piracy.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Piracy: </b>%s
otherCrimes.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Other: </b>%s
dateOfLastCrime.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Date of Last Crime: </b>%s<br>

otherModifiers.text=<br><b><font size='6'>Other Modifiers: %s</font></b>
inactiveYears.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Inactivity: </b>%d
customModifier.text=<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Custom Modifier: </b>%s
4 changes: 2 additions & 2 deletions MekHQ/resources/mekhq/resources/CampaignGUI.properties
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ btnTransportReport.text=Transport Capacity
btnHangarOverview.text=Hangar Breakdown
btnPersonnelOverview.text=Personnel Breakdown
btnCargoCapacity.text=Cargo Capacity
btnUnitRating.text=Unit Rating Details
btnUnitRating.text=Reputation Report
panReports.title=Available Reports
panObjectives.title=Current Objectives
lblRating.text=<html><nobr><b>Unit Rating:</b></nobr></html>;
lblRating.text=<html><nobr><b>Reputation:</b></nobr></html>;
lblPersonnel.text=<html><nobr><b>Personnel:</b></nobr></html>;
lblMorale.text=<html><nobr><b>Morale:</b></nobr></html>;
lblAdministrativeCapacity.text=<html><nobr><b>Administrative Capacity:</b></nobr></html>;
Expand Down
13 changes: 8 additions & 5 deletions MekHQ/resources/mekhq/resources/CampaignOptionsDialog.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ CampaignOptionsDialog.title=Campaign Options

## General Tab
generalPanel.title=General
unitRatingMethodLabel.text=Unit Rating Method:
manualUnitRatingModifierLabel.text=Manual Unit Rating Modifier
unitRatingMethodLabel.text=Unit Reputation Method:
manualUnitRatingModifierLabel.text=Manual Reputation Modifier
lblName.text=Name:
lblDate.text=Date:
lblFaction.text=Faction:
Expand Down Expand Up @@ -434,12 +434,17 @@ lifePathsPanel.title=Life Paths
personnelRandomizationPanel.title=Personnel Randomization
chkUseDylansRandomXP.text=Use Dylan's Random XP (Unofficial)
chkUseDylansRandomXP.toolTipText=Use Dylan's optional random XP on creation of a new person (20% chance each of 0, 1, 2, 3, and randomized between 1 and 8 XP)

# Random Histories
randomHistoriesPanel.title=Random Histories
chkUseRandomPersonalities.text=Use Random Personalities
chkUseRandomPersonalities.toolTipText=<html>Personnel are generated with random personality traits, quirks and intelligence.\
<br>\
<br>Intelligence affects a characters ability to graduate from education module academies.\
<br>Intelligence affects a character's ability to graduate from education module academies.\
<br>\
<br>While traits and quirks do not currently have a mechanical effect, they will be used by the upcoming Random Events module.</html>
chkUseRandomPersonalityReputation.text=Personalities Influence Unit Reputation
chkUseRandomPersonalityReputation.toolTipText=if enabled, the personality of the campaign commander will impact the unit's Reputation.

# Family
familyPanel.title=Family (Unofficial)
Expand Down Expand Up @@ -868,8 +873,6 @@ chkUseStratCon.text=Use StratCon campaign rules
chkUseStratCon.toolTipText=An update of the AtB ruleset.
lblSkillLevel.text=Skill Level
lblSkillLevel.toolTipText=<html>This is the difficulty level for generated scenarios. <br>Values above Elite are not recommended.</html>
lblAtbCamOpsDivision.text=CamOps Unit Rating Modifier Divider
lblAtbCamOpsDivision.toolTipText=<html><body style="width:200px">Many AtB systems modify rolls based on unit rating. Due to how CamOps unit rating is calculated, this can result in receiving the maximum modifier much sooner compared to using the FM:Mr unit rating. To address this, this value divides the CamOps unit rating to determine the modifier applied to AtB's systems.</body></html>
lblScenarioMod.text=Random Scenario Modifiers
lblScenarioModMax.text=Maximum:
lblScenarioModMax.toolTipText=This is the maximum number of random scenario mods that can spawn on for a single Scenario. Excludes StratCon facility modifiers.
Expand Down
2 changes: 1 addition & 1 deletion MekHQ/resources/mekhq/resources/GUI.properties
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ PersonnelReportDialog.title=Personnel Report
TransportReportDialog.title=Transport Capacity Report

### UnitRatingReportDialog Class
UnitRatingReportDialog.title=Unit Rating Report
UnitRatingReportDialog.title=Reputation Report

#### Unspecified Dialogs
### AddOrEditPersonnelEntryDialog Class
Expand Down
Loading

0 comments on commit cb75889

Please sign in to comment.