Skip to content
Snippets Groups Projects
Commit a9a7f157 authored by svornost's avatar svornost
Browse files

Fix class names too

parent 3e813285
No related branches found
No related tags found
1 merge request!7419Fixes/cleanup for saRivalries
Hide whitespace changes
Inline Side-by-side
src/endWeek/saRivalries.js
+ 14
− 14
View file @ a9a7f157
......@@ -217,7 +217,7 @@ App.SlaveAssignment.rivalries = (function() {
slave.devotion += 3;
rival.trust -= 3;
if (slave.rivalry < 3) {
r.push(`Of course, this <span class="rival inc">worsens their rivalry.</span>`);
r.push(`Of course, this <span class="rivalry inc">worsens their rivalry.</span>`);
incRivalry = 1;
worsenedRivalry = 1;
}
......@@ -228,7 +228,7 @@ App.SlaveAssignment.rivalries = (function() {
slave.devotion += 3;
rival.devotion -= 3;
if (slave.rivalry < 3) {
r.push(`Of course, this <span class="rival inc">worsens their rivalry.</span>`);
r.push(`Of course, this <span class="rivalry inc">worsens their rivalry.</span>`);
incRivalry = 1;
worsenedRivalry = 1;
}
......@@ -241,28 +241,28 @@ App.SlaveAssignment.rivalries = (function() {
if (worsenedRivalry !== 1) {
if (roll > 50) {
if (rival.fetish === slave.fetish) {
r.push(`${slave.slaveName} and ${SlaveFullName(rival)} share sexual interests, and in the sexual atmosphere of the arcology, it's <span class="rival dec">difficult for them to keep up their dislike</span> of one another with the mutual attraction.`);
r.push(`${slave.slaveName} and ${SlaveFullName(rival)} share sexual interests, and in the sexual atmosphere of the arcology, it's <span class="rivalry dec">difficult for them to keep up their dislike</span> of one another with the mutual attraction.`);
decRivalry = 1;
lightenedRivalry = 1;
}
if (roll > 80 && slave.rivalry > 0) {
if (rival.trust < -20) {
if (slave.trust < -20) {
r.push(`Since both ${slave.slaveName} and ${SlaveFullName(rival)} are terrified of you, they work together to <span class="rival dec">get over their feud,</span> since it brings punishment on both of them.`);
r.push(`Since both ${slave.slaveName} and ${SlaveFullName(rival)} are terrified of you, they work together to <span class="rivalry dec">get over their feud,</span> since it brings punishment on both of them.`);
decRivalry = 1;
lightenedRivalry = 1;
}
}
if (rival.devotion > 50) {
if (slave.devotion > 50) {
r.push(`Since both ${slave.slaveName} and ${SlaveFullName(rival)} are devoted to you, they work together to <span class="rival dec">get over their feud,</span> since it gets in the way of their duties.`);
r.push(`Since both ${slave.slaveName} and ${SlaveFullName(rival)} are devoted to you, they work together to <span class="rivalry dec">get over their feud,</span> since it gets in the way of their duties.`);
decRivalry = 1;
lightenedRivalry = 1;
}
}
if (roll > 90 && slave.rivalry > 0) {
if (slave.energy > 95) {
r.push(`${slave.slaveName} lusts after ${SlaveFullName(rival)}, and does everything ${he} can to <span class="rival dec">patch up their differences.</span>`);
r.push(`${slave.slaveName} lusts after ${SlaveFullName(rival)}, and does everything ${he} can to <span class="rivalry dec">patch up their differences.</span>`);
decRivalry = 1;
lightenedRivalry = 1;
lustyFix = 1;
......@@ -270,7 +270,7 @@ App.SlaveAssignment.rivalries = (function() {
if (lustyFix !== 1) {
if (slave.attrXX > 85) {
if (rival.vagina > -1 || rival.faceShape !== "masculine") {
r.push(`${slave.slaveName} lusts after ${SlaveFullName(rival)}, and does everything ${he} can to <span class="rival dec">patch up their differences.</span>`);
r.push(`${slave.slaveName} lusts after ${SlaveFullName(rival)}, and does everything ${he} can to <span class="rivalry dec">patch up their differences.</span>`);
decRivalry = 1;
lightenedRivalry = 1;
lustyFix = 1;
......@@ -280,7 +280,7 @@ App.SlaveAssignment.rivalries = (function() {
if (lustyFix !== 1) {
if (slave.attrXY > 85) {
if (canAchieveErection(rival) || rival.faceShape === "masculine") {
r.push(`${slave.slaveName} lusts after ${SlaveFullName(rival)}, and does everything ${he} can to <span class="rival dec">patch up their differences.</span>`);
r.push(`${slave.slaveName} lusts after ${SlaveFullName(rival)}, and does everything ${he} can to <span class="rivalry dec">patch up their differences.</span>`);
decRivalry = 1;
lightenedRivalry = 1;
lustyFix = 1;
......@@ -290,7 +290,7 @@ App.SlaveAssignment.rivalries = (function() {
if (lustyFix !== 1) {
if (rival.assignment !== slave.assignment) {
if (slave.subTarget !== rival.ID && rival.subTarget !== slave.ID) {
r.push(`With time apart ${slave.slaveName} and ${SlaveFullName(rival)} <span class="rival dec">dislike each other less.</span>`);
r.push(`With time apart ${slave.slaveName} and ${SlaveFullName(rival)} <span class="rivalry dec">dislike each other less.</span>`);
decRivalry = 1;
lightenedRivalry = 1;
}
......@@ -302,27 +302,27 @@ App.SlaveAssignment.rivalries = (function() {
}
if (areRelated(slave, rival)) {
if (roll > 70 && slave.rivalry < 3 && lightenedRivalry !== 1) {
r.push(`${slave.slaveName} and ${SlaveFullName(rival)} <span class="rival inc">pursue their family rivalry.</span>`);
r.push(`${slave.slaveName} and ${SlaveFullName(rival)} <span class="rivalry inc">pursue their family rivalry.</span>`);
incRivalry = 1;
worsenedRivalry = 1;
} else if (roll > 40 && slave.rivalry > 0 && worsenedRivalry !== 1) {
r.push(`${slave.slaveName} and ${SlaveFullName(rival)} <span class="rival dec">patch up their family relationship.</span>`);
r.push(`${slave.slaveName} and ${SlaveFullName(rival)} <span class="rivalry dec">patch up their family relationship.</span>`);
decRivalry = 1;
lightenedRivalry = 1;
}
}
if (rival.origBodyOwnerID === slave.ID && lightenedRivalry !== 1) {
if (slave.rivalry < 3) {
r.push(`${slave.slaveName} <span class="rival inc">refuses to accept ${SlaveFullName(rival)}'s control of ${his} former body,</span> worsening their rivalry.`);
r.push(`${slave.slaveName} <span class="rivalry inc">refuses to accept ${SlaveFullName(rival)}'s control of ${his} former body,</span> worsening their rivalry.`);
incRivalry = 1;
}
} else if (roll > (slave.devotion - slave.trust + 10) && lightenedRivalry !== 1) {
if (slave.rivalry < 3) {
r.push(`${slave.slaveName} <span class="rival inc">bickers with ${SlaveFullName(rival)}</span> whenever ${he} can, worsening their rivalry.`);
r.push(`${slave.slaveName} <span class="rivalry inc">bickers with ${SlaveFullName(rival)}</span> whenever ${he} can, worsening their rivalry.`);
incRivalry = 1;
}
} else if (roll < (slave.devotion - slave.trust - 10) && slave.rivalry > 0 && worsenedRivalry !== 1) {
r.push(`${slave.slaveName} does ${his} best to be nice to ${SlaveFullName(rival)}, and manages to <span class="rival dec">de-escalate their little feud.</span>`);
r.push(`${slave.slaveName} does ${his} best to be nice to ${SlaveFullName(rival)}, and manages to <span class="rivalry dec">de-escalate their little feud.</span>`);
decRivalry = 1;
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment