Skip to content
Snippets Groups Projects

fixes-saGuardYou-JS

Merged Blank_Alt requested to merge Blank_Alt/fc-pregmod:fixes-saGuardYou-JS into pregmod-master
1 unresolved thread

Merge request reports

Merged by PregmodderPregmodder 5 years ago (Apr 2, 2020 4:43am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
302 r.push(`${He} does ${his} best to train V.Wardeness.slaveName whenever ${he} can, hoping that your Wardeness can be made capable of stepping into ${his} place.`);
302 r.push(`${He} does ${his} best to train ${V.Wardeness.slaveName} whenever ${he} can, hoping that your Wardeness can be made capable of stepping into ${his} place.`);
303 303 candidate = V.Wardeness;
304 304 }
305 305 }
306 306 if (!candidate) {
307 307 candidate = successorCandidates.find(function(s) { return s.skill.combat === 0; });
308 308 if (candidate) {
309 r.push(`${He} does ${his} best to train candidate.slaveName whenever ${he} can, hoping that ${his} subordinate can be made capable of stepping into ${his} place.`);
309 r.push(`${He} does ${his} best to train ${candidate.slaveName} whenever ${he} can, hoping that ${his} subordinate can be made capable of stepping into ${his} place.`);
310 310 }
311 311 }
312 312 if (candidate) {
313 if ((slave.intelligence + slave.intelligenceImplant - flawedTrainee) > jsRandom(1, 500)) {
314 r.push(`By the end of the week, ${he} is satisfied that V.subSlave.slaveName <span class="green">has the combat skill</span> to contribute to your defense.`);
313 if ((candidate.intelligence + candidate.intelligenceImplant - flawedTrainee) > jsRandom(1, 500)) {
  • Blank_Alt added 1 commit

    added 1 commit

    Compare with previous version

  • merged

  • Pregmodder mentioned in commit 9f6f09a0

    mentioned in commit 9f6f09a0

  • Please register or sign in to reply
    Loading