Skip to content
Snippets Groups Projects
Commit 892f5220 authored by kopareigns's avatar kopareigns
Browse files

tweaks

parent c9bff679
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/debugging/debugWidgets.tw
+ 2
− 2
View file @ 892f5220
...@@ -15,7 +15,7 @@ The included "Go Back" link is intended to replace the usual NextButton. ...@@ -15,7 +15,7 @@ The included "Go Back" link is intended to replace the usual NextButton.
<<link "Go Back">> <<link "Go Back">>
<<script>> <<script>>
Engine.backward(); /* Moves the save state one state backwards. */ Engine.backward(); /* Moves the save state one state backwards. */
var newestHistory = State.history.pop(); /* Removes the latest save state. Necessary to allow the option of displaying the changed variables again immediately without screwing everything up. */ State.history.splice(-1,1); /* Removes the latest save state. Necessary to allow the option of displaying the changed variables again immediately without screwing everything up. */
Config.history.maxStates = 1; /* Reset the max number of states so as not to explode save file sizes. */ Config.history.maxStates = 1; /* Reset the max number of states so as not to explode save file sizes. */
<</script>> <</script>>
<</link>> <</link>>
...@@ -45,7 +45,7 @@ Differences: ...@@ -45,7 +45,7 @@ Differences:
<<link "Go Back">> <<link "Go Back">>
<<script>> <<script>>
Engine.backward(); /* Moves the save state one state backwards. */ Engine.backward(); /* Moves the save state one state backwards. */
var newestHistory = State.history.pop(); /* Removes the latest save state. Necessary to allow the option of displaying the changed variables again immediately without screwing everything up. */ State.history.splice(-1,1); /* Removes the latest save state. Necessary to allow the option of displaying the changed variables again immediately without screwing everything up. */
Config.history.maxStates = 1; /* Reset the max number of states so as not to explode save file sizes. */ Config.history.maxStates = 1; /* Reset the max number of states so as not to explode save file sizes. */
<</script>> <</script>>
<</link>> <</link>>
......
src/uncategorized/saRelationships.tw
+ 22
− 24
View file @ 892f5220
...@@ -208,9 +208,6 @@ ...@@ -208,9 +208,6 @@
<<if def _J>> <<if def _J>>
<<set _SlaveJ = $slaves[_J], _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveJ.relationship = _SlaveI.relationship>> <<set _SlaveJ = $slaves[_J], _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveJ.relationship = _SlaveI.relationship>>
<</if>> <</if>>
<<if _SlaveI.rivalryTarget != _SlaveI.relationTarget>>
<<set _K = $slaveIndices[_SlaveI.relationTarget]>>
<</if>>
<<if (_SlaveI.relationship > 0) && (_SlaveJ == null)>> <<if (_SlaveI.relationship > 0) && (_SlaveJ == null)>>
<br>@@.red;_SlaveI.slaveName's relationship was _SlaveI.relationship and relationshipTarget was _SlaveI.relationshipTarget but no slave with that ID was found@@<br> <br>@@.red;_SlaveI.slaveName's relationship was _SlaveI.relationship and relationshipTarget was _SlaveI.relationshipTarget but no slave with that ID was found@@<br>
<<set _SlaveI.relationship = 0, _SlaveI.relationshipTarget = 0>> <<set _SlaveI.relationship = 0, _SlaveI.relationshipTarget = 0>>
...@@ -1560,26 +1557,29 @@ ...@@ -1560,26 +1557,29 @@
<<else>> <<else>>
<<if def _K && _SlaveI.trust <= 95>> <<if _SlaveI.rivalryTarget != _SlaveI.relationTarget>>
_SlaveI.slaveName <<set _K = $slaveIndices[_SlaveI.relationTarget]>>
<<if _SlaveI.trust < -20>> <<if def _K && _SlaveI.trust <= 95>>
<<if _SlaveI.relation == "mother">> _SlaveI.slaveName
is @@.gold;agonizingly aware@@ that her child $slaves[_K].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does her best@@ to protect her. <<if _SlaveI.trust < -20>>
<<set _SlaveI.trust -= 4, _SlaveI.devotion += 4>> <<if _SlaveI.relation == "mother">>
<<else>> is @@.gold;agonizingly aware@@ that her child $slaves[_K].slaveName is also your slave and might suffer if either of them angers you, and @@.hotpink;does her best@@ to protect her.
is @@.gold;painfully conscious@@ that her <<if _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best she can. <<set _SlaveI.trust -= 4, _SlaveI.devotion += 4>>
<<set _SlaveI.trust -= 2, _SlaveI.devotion += 2>> <<else>>
<</if>> is @@.gold;painfully conscious@@ that her <<if _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName is also your slave and might suffer if either of them displeases you, and @@.hotpink;tries to obey@@ as best she can.
<<else>> <<set _SlaveI.trust -= 2, _SlaveI.devotion += 2>>
knows that her <<if _SlaveI.relation == "mother">>daughter<<elseif _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName <</if>>
<<if $slaves[_K].devotion > 50>>
loves being your sex slave, and is @@.hotpink;happy@@ for her.
<<set _SlaveI.devotion += 2>>
<<elseif ($slaves[_K].devotion > 20) || ($slaves[_K].trust < -20)>>
is an obedient sex slave, and hopes she'll avoid punishment.
<<else>> <<else>>
hates being a sex slave, and is @@.gold;afraid@@ for her. knows that her <<if _SlaveI.relation == "mother">>daughter<<elseif _SlaveI.relation == "daughter">>mother<<else>>_SlaveI.relation<</if>> $slaves[_K].slaveName
<<set _SlaveI.trust -= 2>> <<if $slaves[_K].devotion > 50>>
loves being your sex slave, and is @@.hotpink;happy@@ for her.
<<set _SlaveI.devotion += 2>>
<<elseif ($slaves[_K].devotion > 20) || ($slaves[_K].trust < -20)>>
is an obedient sex slave, and hopes she'll avoid punishment.
<<else>>
hates being a sex slave, and is @@.gold;afraid@@ for her.
<<set _SlaveI.trust -= 2>>
<</if>>
<</if>> <</if>>
<</if>> <</if>>
<</if>> <</if>>
...@@ -1591,5 +1591,3 @@ ...@@ -1591,5 +1591,3 @@
<<set $slaves[_J] = _SlaveJ>> <<set $slaves[_J] = _SlaveJ>>
<</if>> <</if>>
<</if>> /% CLOSES FUCKDOLL CHECK %/ <</if>> /% CLOSES FUCKDOLL CHECK %/
<<unset _K>>
src/uncategorized/storyCaption.tw
+ 2
− 2
View file @ 892f5220
...@@ -621,12 +621,12 @@ ...@@ -621,12 +621,12 @@
<br> <br>
<<link "Display Variables">><<checkvars>><</link>> <<link "Display Variables">><<checkvars>><</link>>
<br> <br>
<<link "Bug Report">><<bugreport>><</link>>
<br>
<<link "Display Changed Variables">> <<link "Display Changed Variables">>
<<set Config.history.maxStates = 2>> /* makes sure we store the current state so we can return to it */ <<set Config.history.maxStates = 2>> /* makes sure we store the current state so we can return to it */
<<goto "Variable Difference">> <<goto "Variable Difference">>
<</link>> <</link>>
<br>
<<link "Bug Report">><<bugreport>><</link>>
<</if>> <</if>>
<</nobr>> <</nobr>>
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