From 43b7f9f8f235a1b8a8765f39e5c22e5e460ab386 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 20 Nov 2019 23:31:08 -0500
Subject: [PATCH] patch notes + tail RA priority fix
---
Changelog.txt | 12 ++++++++++++
src/gui/mainMenu/AlphaDisclaimer.tw | 2 +-
src/js/DefaultRules.js | 6 ++++--
3 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 9ddc2017629..0cbdbbbf312 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,17 @@
Pregmod
+0.10.7.1-3.0.x
+
+ 0
+
+ -added FS Intellectual Dependency
+ -added FS Slave Professionalism
+ -added FS Statuesque Glorification
+ -added FS Petite Admiration
+ -minor bug fixes
+ -eyes currently in a state of flux
+
+
0.10.7.1-2.9.x
11/09/2019
diff --git a/src/gui/mainMenu/AlphaDisclaimer.tw b/src/gui/mainMenu/AlphaDisclaimer.tw
index ef6bd83525c..59d65b44464 100644
--- a/src/gui/mainMenu/AlphaDisclaimer.tw
+++ b/src/gui/mainMenu/AlphaDisclaimer.tw
@@ -1,6 +1,6 @@
:: Alpha disclaimer
-//version $ver mod version $pmodVer build $releaseID//
+//version $ver mod version $pmodVer build $releaseID commit 1f8996d09//
@@.green;//Mod: expanded age ranges and other tweaks 2016-08-30//@@ @@.darkred;+SV@@
@@.green;//Mod: extra preg content and other crap//@@
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index c01821f30fe..a9c72fad4a2 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -909,8 +909,10 @@ window.DefaultRules = (function() {
*/
function ProcessButtplugAttachments(slave, rule) {
// apply buttplug accessories to slaves
- if (slave.buttplug === "none" && slave.buttplugAttachment !== "none") {
- slave.buttplugAttachment = "none"; // clears buttplug attachments when buttplugs are removed above
+ if (slave.buttplug === "none") {
+ if (slave.buttplugAttachment !== "none") {
+ slave.buttplugAttachment = "none"; // clears buttplug attachments when buttplugs are removed above
+ } // otherwise ignores the rule since the slave is not wearing a buttplug
} else if ((rule.buttplugAttachment !== undefined) && (rule.buttplugAttachment !== null)) {
if ((slave.buttplugAttachment !== rule.buttplugAttachment)) {
slave.buttplugAttachment = rule.buttplugAttachment;
--
GitLab