From c395c17f5b5a8c296ea9663d0a691fa307e0c061 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 11 Apr 2018 23:46:19 -0400
Subject: [PATCH] More fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 5 ++++
devNotes/twine JS | 24 +++++++++++++++++++-
src/npc/descriptions/fVagina.tw | 3 ++-
src/uncategorized/pRivalryVictory.tw | 2 +-
src/uncategorized/saRivalries.tw | 2 +-
5 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index be553b74c58..858a3b4b09e 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,11 @@
4/11/2018
+ 41
+ -various fixes
+ -encyclopedia prodding from SFanon
+ -new means to add, remove, and locate slaves via index map
+
40
-added fuckdoll impregnation
-preglocke's fSlaveSlaveVagConsumate cleanup and content addition
diff --git a/devNotes/twine JS b/devNotes/twine JS
index ef27e3617f2..79d7818d47c 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -6867,6 +6867,28 @@ window.inferiorRaceP = function inferiorRaceP(slave) {
return State.variables.arcologies[0].FSSubjugationistRace === slave.race
}
+window.addSlave = function addSlave(slave) {
+ State.variables.slaves.push(slave);
+ State.variables.slaveIndices[slave.id] = State.variables.slaves.length - 1;
+};
+
+window.removeSlave = function removeSlave(index) {
+ delete State.variables.slaveIndices[State.variables.slaves[index].id];
+ return State.variables.slaves.deleteAt(index);
+};
+
+window.slaves2indices = function slaves2indices() {
+ const obj = {};
+ State.variables.slaves.forEach((slave, i) => obj[slave.id] = i);
+ return obj;
+};
+
+window.getSlave = function getSlave(ID) {
+ const index = State.variables.slaveIndices[ID];
+ if (index === undefined) return null;
+ else return State.variables.slaves[State.variables.slaveIndices[ID]];
+};
+
/*:: wombJS [script]*/
/*
@@ -7911,7 +7933,7 @@ window.todaysCorset = function(slave) {
// this is a port of the FResult widget
// it has been broken up into several functions, because it grew too long
-// it has been wrapped in a closure so as not to polute the global namespace
+// it has been wrapped in a closure so as not to pollute the global namespace
// and so that nested functions are only evaluated once
window.FResult = (function() {
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 4a377fbfda3..af198931a3c 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -97,7 +97,7 @@ You call her over so you can
<<if canWalk($activeSlave) && $activeSlave.fetish != "mindbroken">>
You decide to fuck her
<<if (_fPosition <= 20)>>
- in the missionary position. You tell her to lie down on the couch next to your desk.
+ in the missionary position.
<<if $activeSlave.bellyPreg >= 600000>>
A position that will be a challenge due to her immense pregnancy.
<<elseif $activeSlave.belly >= 600000>>
@@ -109,6 +109,7 @@ You call her over so you can
<<elseif $activeSlave.belly+$PC.belly >= 20000 && $activeSlave.belly >= 1500 && $PC.belly >= 1500>>
A position that will be difficult with the combined size of your rounded middles.
<</if>>
+ You tell her to lie down on the couch next to your desk.
<<elseif (_fPosition <= 40)>>
in the cowgirl position. You lie on the couch beside your desk and tell her to straddle you, facing towards you.
<<if $activeSlave.bellyPreg >= 600000>>
diff --git a/src/uncategorized/pRivalryVictory.tw b/src/uncategorized/pRivalryVictory.tw
index efe9d5f0cfe..51f10ade740 100644
--- a/src/uncategorized/pRivalryVictory.tw
+++ b/src/uncategorized/pRivalryVictory.tw
@@ -125,7 +125,7 @@ For the first time, you receive a direct call from your rival. You pictured the
<<set $cash -= random(10000,25000)>>
<</if>>
<<set $cash -= 50000>>
- <<include "pRivalryCapture">>
+ <<include "P rivalry capture">>
<</replace>>
<</link>>
</span>
diff --git a/src/uncategorized/saRivalries.tw b/src/uncategorized/saRivalries.tw
index 985f3e79311..ac2493535cc 100644
--- a/src/uncategorized/saRivalries.tw
+++ b/src/uncategorized/saRivalries.tw
@@ -82,7 +82,7 @@
<<break>>
<</if>>
<<case "devout">>
- <<if $slaves[_j].behavioralFlaw == "anorexic">>
+ <<if $slaves[_j].behavioralFlaw == "liberated">>
$slaves[$i].slaveName, who is devout and might be considered rather conservative if she were free, can't stand <<SlaveFullName $slaves[_j]>>'s revolting gender liberation. @@.lightsalmon;They start to dislike each other.@@
<<set $slaves[_j].rivalry = 1, $slaves[$i].rivalry = 1, $slaves[_j].rivalryTarget = $slaves[$i].ID, $slaves[$i].rivalryTarget = $slaves[_j].ID>>
<<break>>
--
GitLab