Skip to content

Commit b26e377

Browse files
authored
Merge pull request #7221 from IllianiBird/newPersonnelMarketExperienceClamping
Improvement: #7220 Loosened Applicant Experience Level Clamping in New Personnel Market
2 parents 1e01e2e + 60e5515 commit b26e377

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

MekHQ/src/mekhq/campaign/market/personnelMarket/markets/PersonnelMarketMekHQ.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import java.util.Map;
5151
import java.util.Set;
5252

53+
import megamek.common.Compute;
5354
import megamek.common.enums.Gender;
5455
import mekhq.MekHQ;
5556
import mekhq.campaign.Campaign;
@@ -243,7 +244,7 @@ public void generateApplicants() {
243244
unorderedMarketEntries = sanitizeMarketEntries(unorderedMarketEntries);
244245
List<PersonnelMarketEntry> orderedMarketEntries = getMarketEntriesAsList(unorderedMarketEntries);
245246

246-
for (int roll = 0; roll < getRecruitmentRolls(); roll++) {
247+
for (int recruitmentRoll = 0; recruitmentRoll < getRecruitmentRolls(); recruitmentRoll++) {
247248
Person applicant = generateSingleApplicant(unorderedMarketEntries, orderedMarketEntries);
248249
if (applicant == null) {
249250
continue;
@@ -252,8 +253,22 @@ public void generateApplicants() {
252253
int applicantSkill = applicant.getSkillLevel(getCampaign(), false).getExperienceLevel();
253254

254255
if (applicantSkill > averageSkillLevel) {
255-
getLogger().debug("Applicant is too experienced for the campaign, skipping.");
256-
continue;
256+
boolean notInterested = false;
257+
258+
int difference = applicantSkill - averageSkillLevel;
259+
for (int i = 0; i < difference; i++) {
260+
int interestRoll = Compute.randomInt(10); // TODO make this a campaign option
261+
262+
if (interestRoll != 0) {
263+
notInterested = true;
264+
break;
265+
}
266+
}
267+
268+
if (notInterested) {
269+
getLogger().debug("Applicant is too experienced for the campaign, skipping.");
270+
continue;
271+
}
257272
}
258273

259274
addApplicant(applicant);

0 commit comments

Comments
 (0)