Skip to content
Snippets Groups Projects

inflationCancellation fixes

Merged Anu requested to merge Anu/fc-pregmod:anu-fix into pregmod-master

Fixes for a smaller problem I noticed while investigating # 5649: interslave inflation was not being properly adjusted when the harvest dropped, and half the text was missing anyway.

Merge Checklist
  • I have read CONTRIBUTING.md
    • and
      • my code editor has
        • ESLint support enabled
        • TypeScript support enabled
        • some form of spell checker
          • We suggest using a spell checker compatible with cSpell if possible
      • my changes compile successfully and seem to work properly
      • I am using the simple compiler (simple-compiler.[bat or sh])
      • I am using the normal compiler (compile.[bat or sh])
      • this is my first merge request
      • the changes in this merge request comply with the coding style defined in CONTRIBUTING.md
Changes made
  • Copied the introductory sentence of slave-slave inflation cancellation so that it displays at all levels of inflation, not just at 8 liters.
  • Added a few commas where appropriate, through an admittedly less graceful sentence split (if only addToLast() worked with string arrays, or join() with SpacedTextAccumulators!)
  • Added code to actually reduce/deflate slave-slave inflation, which seemed to have been entirely forgotten when the function was originally written.
  • Highlighted inflation reductions in yellow, same as full deflations. It's a change to the physical regimen the player assigned, which should be called out, even if it's a smaller change than full deflation.
  • Applied all of the above (except the commas) to inflationCancellation in prInflation as well.
  • Unrelated minor proofreading in electiveSurgery.

Things left to do

  • code review (this is done by one or more people other than you)
  • final tests
  • let Pregmodder know that this is ready for merging
Edited by Anu

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading