From defe6de3ad43e39bf3907a2dab9a4dc194d7fcb7 Mon Sep 17 00:00:00 2001
From: Vas <whiterocket@outlook.com>
Date: Tue, 19 Jun 2018 15:04:19 +0300
Subject: [PATCH] fix several minor bugs
---
src/js/DefaultRules.tw | 12 ++++++------
src/js/rulesAssistant.tw | 2 +-
src/js/rulesAssistantOptions.tw | 15 +++++++++++++--
3 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index b19c765ba3c..e803e085001 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -298,7 +298,7 @@ window.DefaultRules = (function() {
r += `<br>${slave.slaveName} is now allowed to select her own assignments.`;
break;
default:
- r += `<br>${slave.slaveName} has been automatically assigned to rule.setAssignment.`;
+ r += `<br>${slave.slaveName} has been automatically assigned to ${rule.setAssignment}.`;
break;
}
assignJob(slave, rule.setAssignment);
@@ -494,7 +494,7 @@ window.DefaultRules = (function() {
break;
default:
- r += `<br>${slave.slaveName} is a virgin and has been given a slave.vaginalAccessory for her pussy.`;
+ r += `<br>${slave.slaveName} is a virgin and has been given a ${slave.vaginalAccessory} for her pussy.`;
break;
}
}
@@ -1536,7 +1536,7 @@ window.DefaultRules = (function() {
if ((slave.assignment != "recruit girls")) {
if ((slave.assignment != "be the Wardeness")) {
if ((slave.assignment != "be the Madam")) {
- _oldHormones = slave.hormones;
+ const _oldHormones = slave.hormones;
slave.hormones = rule.XY;
if (slave.indentureRestrictions >= 2) {
slave.hormones = Math.clamp(slave.hormones, -1, 1);
@@ -2056,7 +2056,7 @@ window.DefaultRules = (function() {
if (slave.clitSetting !== rule.clitSetting) {
slave.clitSetting = rule.clitSetting;
_used = 1;
- r += `<br>${slave.slaveName}'s smart piercing has been set to slave.clitSetting.`;
+ r += `<br>${slave.slaveName}'s smart piercing has been set to ${slave.clitSetting}.`;
} else if (slave.fetishStrength < 100) {
_used = 1;
}
@@ -2200,8 +2200,8 @@ window.DefaultRules = (function() {
if ((rule.autoBrand == 1)) {
if ((slave.brand == 0)) {
if ((slave.health > -20)) {
- slave.brand = $brandDesign;
- slave.brandLocation = $brandTarget;
+ slave.brand = V.brandDesign;
+ slave.brandLocation = V.brandTarget;
if ((slave.devotion < 18))
slave.devotion -= 5;
slave.trust -= 5;
diff --git a/src/js/rulesAssistant.tw b/src/js/rulesAssistant.tw
index b127b99335f..0238e043c66 100644
--- a/src/js/rulesAssistant.tw
+++ b/src/js/rulesAssistant.tw
@@ -184,7 +184,7 @@ window.ruleAppliesP = function ruleAppliesP(cond, slave) {
cond.data.value[1]);
break;
case "custom": // user provided JS function
- flag = eval(data)(slave);
+ flag = eval(cond.data)(slave);
break;
}
// assignment / facility / special slaves / specific slaves check
diff --git a/src/js/rulesAssistantOptions.tw b/src/js/rulesAssistantOptions.tw
index e39176d9a4f..20c4802a44d 100644
--- a/src/js/rulesAssistantOptions.tw
+++ b/src/js/rulesAssistantOptions.tw
@@ -603,7 +603,7 @@ window.rulesAssistantOptions = (function() {
render(data) {
const elem = document.createElement("textarea");
elem.innerHTML = data;
- elem.onfocusout = () => current_rule.condition.data = elem.value;
+ elem.onblur = () => current_rule.condition.data = elem.value;
return elem;
}
}
@@ -666,7 +666,18 @@ window.rulesAssistantOptions = (function() {
}
info(attribute) {
- return "TODO";
+ return ({
+ "devotion": "Very Hateful: (-∞, -95), Hateful: [-95, -50), Resistant: [-50, -20), Ambivalent: [-20, 20], Accepting: (20, 50], Devoted: (50, 95], Worshipful: (95, ∞)",
+ "trust": "Extremely terrified: (-∞, -95), Terrified: [-95, -50), Frightened: [-50, -20), Fearful: [-20, 20], Careful: (20, 50], Trusting: (50, 95], Total trust: (95, ∞)",
+ "health": "Death: (-∞, -100), Near Death: [-100, -90), Extremely Unhealthy: [-90, -50), Unhealthy: [-50, -20), Healthy: [-20, 20], Very Healthy: (20, 50], Extremely Healthy: (50, 90], Unnaturally Healthy: (90, ∞)",
+ "energy": "Frigid: (-∞, 20], Poor: (20, 40], Average: (40, 60], Powerful: (60, 80], Sex Addict: (80, 100), Nympho: 100",
+ "weight": "Emaciated: (-∞, -95), Skinny: [-95, -30), Thin: [-30, -10), Average: [-10, 10], Plush: (10, 30], Fat: (30, 95], Overweight: (95, ∞)",
+ "lactation": "None: 0, 1: Natural, 2: Lactation implant",
+ "preg": "Barren: -2, On contraceptives: -1, Not pregnant: 0, Pregnancy weeks: [1, ∞)",
+ "pregType": "Fetus count, known only after the 10th week of pregnancy",
+ "bellyImplant": "Volume in CCs. None: -1",
+ "belly": "Volume in CCs, any source",
+ }[attribute] || " ")
}
}
--
GitLab