Skip to content
Snippets Groups Projects

RESS mutinyAttempt to js

Merged RESS mutinyAttempt to js
Skriv/fc-pregmod:RESS-mutinyAttempt-to-js into pregmod-master
1 unresolved thread
Merged Skriv requested to merge Skriv/fc-pregmod:RESS-mutinyAttempt-to-js into pregmod-master
1 unresolved thread

Tested without problems. Only had 1 usable slave in my save though, so might well have missed something. Would appreciate a review (especially logic).

  • Combined result2 links which were written multiple times for some reason. Only the intro link changed as far as I could tell (except for a single "and").
  • Did not convert all span classes because I couldn't discern the intent behind the colors.
  • Left mutinyAttempt = 2 commented out, as I didn't see the purpose of it. I'm guessing it's a way to set the check later to != 1.

EDIT: and changed mutinery to mutiny since mutinery is not a word (?)

Edited by Skriv

Merge request reports

Merged by PregmodderPregmodder 3 years ago (Jul 6, 2021 7:46pm UTC)

Loading

Pipeline #40926 passed

Stage: build

Pipeline passed for d814ee9f on pregmod-master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
src/events/RESS/mutinyAttempt.js 0 → 100644
120 App.Events.addParagraph(node, r);
121 let choices = [];
122 let choices2 = [];
123 if (mutinyAttempted) {
124 choices.push(new App.Events.Result(`Fight ${him} off as much as you can`, fight));
125 choices.push(new App.Events.Result(`Try to talk it out`, talk));
126 choices.push(new App.Events.Result(`Fake playing along`, fake));
127 App.Events.addResponses(node, choices);
128 } else {
129 App.Events.addParagraph(node, [`With the bitch restrained, you have all the time you need to devise ${his} punishment.`]);
130 // mutinyAttempted = 2; Remove? Why was $mutinery set to 2 (and a global)?
131 choices2.push(new App.Events.Result(`Lock ${his} dick in chastity`, lock));
132 choices2.push(new App.Events.Result(`Flog ${him}`, flog));
133 choices2.push(new App.Events.Result(`Mute ${him}`, mute, `This option will cost ${cashFormat(V.surgeryCost)}`));
134 choices2.push(new App.Events.Result(`Castrate ${him}`, castrate, `This option will cost ${cashFormat(V.surgeryCost)}`));
135 if (eventSlave.vagina === -1) {
  • Skriv
    Skriv @Skriv ·
    Author Reporter

    Also changed this to -1 from -2. VCheck in genderbender appears after .vagina is set to 1. Should probably be seX instead, similarly to other places in the event?

  • Please register or sign in to reply
  • Pregmodder merged

    merged

  • Pregmodder mentioned in commit d814ee9f

    mentioned in commit d814ee9f

    • Please register or sign in to reply