Skip to content
Snippets Groups Projects
Commit 3727cca4 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'major-fixes' into 'pregmod-master' 

Major fixes

Closes #104

See merge request pregmodfan/fc-pregmod!1835
parents af102163 3148cc0e
No related branches found
No related tags found
2 merge requests!2047RA rework,!1835Major fixes
Hide whitespace changes
Inline Side-by-side
src/init/storyInit.tw
+ 1
− 0
View file @ 3727cca4
...@@ -71,6 +71,7 @@ You should have received a copy of the GNU General Public License along with thi ...@@ -71,6 +71,7 @@ You should have received a copy of the GNU General Public License along with thi
<<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>> <<set $slaves[_i].rivalry = 0, $slaves[_i].rivalryTarget = 0, $slaves[_i].subTarget = 0>>
<<else>> <<else>>
<<set _dump = removeSlave(_i), _i--, _SL-->> <<set _dump = removeSlave(_i), _i--, _SL-->>
<<set $slaveIndices = slaves2indices()>>
<</if>> <</if>>
<</for>> <</for>>
<<for _k = 0; _k < _SL; _k++>> <<for _k = 0; _k < _SL; _k++>>
......
src/js/assayJS.tw
+ 0
− 1
View file @ 3727cca4
...@@ -221,7 +221,6 @@ window.addSlave = function addSlave(slave) { ...@@ -221,7 +221,6 @@ window.addSlave = function addSlave(slave) {
}; };
window.removeSlave = function removeSlave(index) { window.removeSlave = function removeSlave(index) {
delete State.variables.slaveIndices[State.variables.slaves[index].ID];
return State.variables.slaves.deleteAt(index); return State.variables.slaves.deleteAt(index);
}; };
......
src/npc/removeActiveSlave.tw
+ 1
− 0
View file @ 3727cca4
...@@ -144,6 +144,7 @@ ...@@ -144,6 +144,7 @@
<</if>> <</if>>
<<set _dump = removeSlave(_x), _SL--, $activeSlave = 0>> <<set _dump = removeSlave(_x), _SL--, $activeSlave = 0>>
<<set $slaveIndices = slaves2indices()>>
<<if _missingID == 1>> <<if _missingID == 1>>
<<set $missingParentID-->> <<set $missingParentID-->>
......
src/uncategorized/REFI.tw
+ 6
− 6
View file @ 3727cca4
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
<<if $subSlave.belly >= 1500>> <<if $subSlave.belly >= 1500>>
You have $subSlave.slaveName lying down on your desk, and are seeing to your own amusement and her masochistic streak at once. She has her body flat on the surface, but is unrestrained, and has been told that she must not rise off it at all, nor tilt her bulk to either side. You then tell her to count strokes and begin to flog her _subBelly belly with a leathern instrument<<if $subSlave.pregKnown == 1>>, taking care not to cause her pregnancy any lasting harm<</if>>. Before long she is experiencing more pain than the human body can support without involuntary movement, and you tell her to go back one count whenever she does. At long last she completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until she stiffens again at the You have $subSlave.slaveName lying down on your desk, and are seeing to your own amusement and her masochistic streak at once. She has her body flat on the surface, but is unrestrained, and has been told that she must not rise off it at all, nor tilt her bulk to either side. You then tell her to count strokes and begin to flog her _subBelly belly with a leathern instrument<<if $subSlave.pregKnown == 1>>, taking care not to cause her pregnancy any lasting harm<</if>>. Before long she is experiencing more pain than the human body can support without involuntary movement, and you tell her to go back one count whenever she does. At long last she completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until she stiffens again at the
<<if canDoAnal($subSlave) && subSlave.anus > 0>> <<if canDoAnal($subSlave) && $subSlave.anus > 0>>
burning sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> stretching her anal sphincter. You are not gentle, and the rough sodomy combined with the burning of her outraged skin as you slap yourself against it maintains her pain high. burning sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> stretching her anal sphincter. You are not gentle, and the rough sodomy combined with the burning of her outraged skin as you slap yourself against it maintains her pain high.
<<else>> <<else>>
sudden sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> slamming deep into her pussy. You are not gentle, and the rough fucking combined with the burning of her outraged skin as you slap yourself against it maintains her pain high. sudden sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> slamming deep into her pussy. You are not gentle, and the rough fucking combined with the burning of her outraged skin as you slap yourself against it maintains her pain high.
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
aburdly massive aburdly massive
<</if>> <</if>>
ass with a leathern instrument. Before long she is experiencing more pain than the human body can support without involuntary movement, and you tell her to go back one count whenever she does. At long last she completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until she stiffens again at the ass with a leathern instrument. Before long she is experiencing more pain than the human body can support without involuntary movement, and you tell her to go back one count whenever she does. At long last she completes the required number of blows, and lies quivering and sobbing, thanking you over and over, until she stiffens again at the
<<if canDoAnal($subSlave) && subSlave.anus > 0>> <<if canDoAnal($subSlave) && $subSlave.anus > 0>>
burning sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> stretching her anal sphincter. You are not gentle, and the rough sodomy combined with the burning of her outraged buttocks as you slap yourself against <<if $subSlave.butt < 2>>it<<else>>them<</if>> maintains her pain high. burning sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> stretching her anal sphincter. You are not gentle, and the rough sodomy combined with the burning of her outraged buttocks as you slap yourself against <<if $subSlave.butt < 2>>it<<else>>them<</if>> maintains her pain high.
<<else>> <<else>>
sudden sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> slamming deep into her pussy. You are not gentle, and the rough fucking combined with the burning of her outraged buttocks as you slap yourself against <<if $subSlave.butt < 2>>it<<else>>them<</if>> maintains her pain high. sudden sensation of a <<if $PC.dick>>cock<<else>>dildo<</if>> slamming deep into her pussy. You are not gentle, and the rough fucking combined with the burning of her outraged buttocks as you slap yourself against <<if $subSlave.butt < 2>>it<<else>>them<</if>> maintains her pain high.
...@@ -194,7 +194,7 @@ It seems she passed by while you were beating $subSlave.slaveName and found the ...@@ -194,7 +194,7 @@ It seems she passed by while you were beating $subSlave.slaveName and found the
$subSlave.slaveName gets inspected more regularly than your other slaves, since she's quite pregnant. Her pregnancy is progressing acceptably, but having her belly inspected gets her $subSlave.slaveName gets inspected more regularly than your other slaves, since she's quite pregnant. Her pregnancy is progressing acceptably, but having her belly inspected gets her
<<if $subSlave.pregSource == -1>> <<if $subSlave.pregSource == -1>>
extremely eager to feel more of her <<WrittenMaster $subSlave>>'s seed in her fertile <<if $subSlave.mpreg == 1>>rear<<else>>cunt<</if>>. $subSlave.slaveName has been a good girl, extremely eager to feel more of her <<WrittenMaster $subSlave>>'s seed in her fertile <<if $subSlave.mpreg == 1>>rear<<else>>cunt<</if>>. $subSlave.slaveName has been a good girl,
<<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && subSlave.vagina > 0)>> <<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && $subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && $subSlave.vagina > 0)>>
<<if $PC.belly >= 5000>> <<if $PC.belly >= 5000>>
so you take her so you take her
<<if $subSlave.belly >= 300000>> <<if $subSlave.belly >= 300000>>
...@@ -228,7 +228,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since ...@@ -228,7 +228,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
<</if>> <</if>>
<<elseif $PC.dick == 1>> <<elseif $PC.dick == 1>>
extremely eager for a good fuck and there's no better dick than her <<WrittenMaster $subSlave>>'s. $subSlave.slaveName has been a good girl, extremely eager for a good fuck and there's no better dick than her <<WrittenMaster $subSlave>>'s. $subSlave.slaveName has been a good girl,
<<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && subSlave.vagina > 0)>> <<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && $subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && $subSlave.vagina > 0)>>
<<if $PC.belly >= 5000>> <<if $PC.belly >= 5000>>
so you take her so you take her
<<if $subSlave.belly >= 300000>> <<if $subSlave.belly >= 300000>>
...@@ -262,7 +262,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since ...@@ -262,7 +262,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
<</if>> <</if>>
<<else>> <<else>>
all hot and bothered. $subSlave.slaveName has been a good girl, all hot and bothered. $subSlave.slaveName has been a good girl,
<<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && subSlave.vagina > 0)>> <<if ($subSlave.mpreg == 1 && canDoAnal($subSlave) && $subSlave.anus > 0) || ($subSlave.mpreg == 0 && canDoVaginal($subSlave) && $subSlave.vagina > 0)>>
so you don a strap-on and take her so you don a strap-on and take her
<<if $PC.belly >= 5000>> <<if $PC.belly >= 5000>>
<<if $subSlave.belly >= 300000>> <<if $subSlave.belly >= 300000>>
...@@ -270,7 +270,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since ...@@ -270,7 +270,7 @@ $subSlave.slaveName gets inspected more regularly than your other slaves, since
<<else>> <<else>>
on the edge of your desk. She doesn't mind the hard surface, not when it means your gravid middle is pushing against her _subBelly own on the edge of your desk. She doesn't mind the hard surface, not when it means your gravid middle is pushing against her _subBelly own
<</if>> <</if>>
as you lanquidly take her. as you languidly take her.
<<else>> <<else>>
on the couch, spooning so that her on the couch, spooning so that her
<<if $subSlave.belly >= 300000>> <<if $subSlave.belly >= 300000>>
......
src/uncategorized/RETS.tw
+ 1
− 1
View file @ 3727cca4
...@@ -1470,7 +1470,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of ...@@ -1470,7 +1470,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<if $PC.dick == 1 && canGetPregnant($activeSlave) && $activeSlave.eggType == "human">> <<if $PC.dick == 1 && canGetPregnant($activeSlave) && $activeSlave.eggType == "human">>
<<KnockMeUp $activeSlave 5 1 -1 1>> <<KnockMeUp $activeSlave 5 1 -1 1>>
<</if>> <</if>>
<<set $subSlave -= 5, $subSlave.devotion += 5>> <<set $subSlave.trust -= 5, $subSlave.devotion += 5>>
<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>> <<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
<</replace>> <</replace>>
<</link>> <</link>>
......
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