From 9a1018b751098a5cd901ba9f3b302d564c95fcc1 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Wed, 28 Mar 2018 22:46:16 -0400
Subject: [PATCH] RERelationshipSlave Removal
---
src/js/eventSelectionJS.tw | 56 ++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 29 deletions(-)
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index a5d188bb260..643515e93bd 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -216,22 +216,21 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(State.variables.RERelationshipSlave != 0) {
- if(eventSlave.relationship > 3) {
- if(State.variables.RERelationshipSlave.devotion > 20) {
- if(canWalk(State.variables.RERelationshipSlave)) {
- if(canTalk(State.variables.RERelationshipSlave)) {
- if(eventSlave.devotion > 50) {
- if(eventSlave.trust > 50) {
- if(eventSlave.speechRules != "restrictive") {
- State.variables.RETSevent.push("date please");
- }
- if(State.variables.RERelationshipSlave.anus != 0) {
- if(State.variables.RERelationshipSlave.dick != 1) {
- if(State.variables.RERelationshipSlave.dick == 0 || canAchieveErection(State.variables.RERelationshipSlave)) {
- if(State.variables.RERelationshipSlave.fetish == "dom" || State.variables.RERelationshipSlave.fetish == "sadist") {
- State.variables.RETSevent.push("top exhaustion");
- }
+ if(eventSlave.relationship > 3) {
+ var index = State.variables.slaves.findIndex(function(s) { return s.ID == eventSlave.relationshipTarget; });
+ if(State.variables.slaves[index].devotion > 20) {
+ if(canWalk(State.variables.slaves[index])) {
+ if(canTalk(State.variables.slaves[index])) {
+ if(eventSlave.devotion > 50) {
+ if(eventSlave.trust > 50) {
+ if(eventSlave.speechRules != "restrictive") {
+ State.variables.RETSevent.push("date please");
+ }
+ if(State.variables.slaves[index].anus != 0) {
+ if(State.variables.slaves[index].dick != 1) {
+ if(State.variables.slaves[index].dick == 0 || canAchieveErection(State.variables.slaves[index])) {
+ if(State.variables.slaves[index].fetish == "dom" || State.variables.slaves[index].fetish == "sadist") {
+ State.variables.RETSevent.push("top exhaustion");
}
}
}
@@ -1923,19 +1922,18 @@ if(eventSlave.fetish != "mindbroken") {
}
}
- if(State.variables.RERelationshipSlave != 0) {
- if(eventSlave.relationship > 3) {
- if(State.variables.RERelationshipSlave.devotion > 20) {
- if(canWalk(State.variables.RERelationshipSlave)) {
- if(canTalk(State.variables.RERelationshipSlave)) {
- if(eventSlave.devotion > 50) {
- if(eventSlave.trust > 50) {
- if(State.variables.RERelationshipSlave.anus != 0) {
- if(State.variables.RERelationshipSlave.dick != 1) {
- if(State.variables.RERelationshipSlave.dick == 0 || canAchieveErection(State.variables.RERelationshipSlave)) {
- if(State.variables.RERelationshipSlave.fetish == "dom" || State.variables.RERelationshipSlave.fetish == "sadist") {
- State.variables.RETSevent.push("top exhaustion");
- }
+ if(eventSlave.relationship > 3) {
+ var index = State.variables.slaves.findIndex(function(s) { return s.ID == eventSlave.relationshipTarget; });
+ if(State.variables.slaves[index].devotion > 20) {
+ if(canWalk(State.variables.slaves[index])) {
+ if(canTalk(State.variables.slaves[index])) {
+ if(eventSlave.devotion > 50) {
+ if(eventSlave.trust > 50) {
+ if(State.variables.slaves[index].anus != 0) {
+ if(State.variables.slaves[index].dick != 1) {
+ if(State.variables.slaves[index].dick == 0 || canAchieveErection(State.variables.slaves[index])) {
+ if(State.variables.slaves[index].fetish == "dom" || State.variables.slaves[index].fetish == "sadist") {
+ State.variables.RETSevent.push("top exhaustion");
}
}
}
--
GitLab