diff --git a/src/init/dummy.tw b/src/init/dummy.tw index 5f1d6258ca5476bf97be27cedfdf84f19aa2f3ae..795c1885c88fb1dde265b0f832f3c6abd8b6d7ae 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -32,4 +32,8 @@ $Girl $corpPeopleEnslaved, $slaveAssets, $slaveAssetPrice, $corpProfit, $corpValue, $sharePrice, $oldSharePrice, $generalAssetPrice, $generalAssets, $entrapmentAssets, $entrapmentAssetPrice, $captureAssets, $captureAssetPrice, $trainingAssets, $trainingAssetPrice, $surgicalAssets, $surgicalAssetPrice, $drugAssets, $drugAssetPrice $TradeShowMenials $readySlaves +$mammaryUseWeight +$activeSlave.readyLimbs, _Slave.readyLimbs, $args[0].readyLimbs +$brothelSpots +$JobIDArray */ diff --git a/src/npc/fBeg.tw b/src/npc/fBeg.tw index d542ec325e59e7af2debb1ce08eabe543084a156..00ed32a385697ee713f5bebbf9a27597b8a9cfcc 100644 --- a/src/npc/fBeg.tw +++ b/src/npc/fBeg.tw @@ -34,7 +34,7 @@ You call $him over to you for inspection. <<BoobsDescription>> You look at $him <</if>> <<if ($activeSlave.devotion > -20)>> $He begins to undress with - <<if ($activeSlave.entertainSkill >= 100)>> + <<if ($activeSlave.skill.entertainment >= 100)>> masterful skill, teasing and taunting all the way down. $He rolls $his hips and most sexual parts as $he removes $his clothing. <<elseif ($activeSlave.skill.entertainment >= 80)>> arousing skill. Even though the goal is just to get $him naked, your slave knows that $his job is to entertain you with $his every move. diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index c83886f6583382ad41a7c54a5546414212aadea1..94b7014a3fa011f47c7bda361340dddb7bd0cab5 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -3688,7 +3688,6 @@ Done! <</for>> <</if>> -<<unset $showOneSlave>> <<unset $SlaveSummaryFiler>> <<if $releaseID < 1044>> diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw index 1ef1c36ef9a395b49f98a670447f128bd7900386..bbfd96a84677f4b6f9b96edcaefb0cac90b12649 100644 --- a/src/uncategorized/nextWeek.tw +++ b/src/uncategorized/nextWeek.tw @@ -429,7 +429,7 @@ /% These are variables that either should be made into _temp vars or should be Zeroed out once done with them instead of here. This can also interfere with debugging or hide NaN's as zeroing things out would clear a NaN. Also could stop from NaN's getting worse? %/ /% Integer and float variables. No real need to zero them out but doesn't hurt to have them in a known state, though this might mask variables NaN'ing out. Takes up the least amount of Memory besides a "" string. %/ -<<set $i = 0, $j = 0, $x = 0, $r = 0, $opinion = 0, $influenceBonus = 0, $averageProsperity = 0, $beauty = 0, $beautyMultiplier = 0, $FResult = 0, $groomSlave = -1, $brideSlave = -1, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>> +<<set $i = 0, $j = 0, $x = 0, $r = 0, $opinion = 0, $influenceBonus = 0, $averageProsperity = 0, $beauty = 0, $FResult = 0, $groomSlave = -1, $brideSlave = -1, $mother = -1, $daughter = -1, $devMother = -1, $devDaughter = -1, $alphaTwin = -1, $betaTwin = -1, $youngerSister = -1, $olderSister = -1, $recruiterSlave = -1>> <<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestTargetID = -1, $subID = -1, $submissiveInterestTargetID = -1>> /% Other arrays %/ diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 41b8762bb2b73e3cc9d760aa48d4e16968d99c9b..3d905bb0f1092f882ec4fb7005bd36523f214497 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -596,7 +596,7 @@ $args[0]: array to sort <</widget>> /% - Call as <<SlaveIDSort [$slaveIDs]>> + Call as <<SlaveIDSort [slaveIDs]>> $args[0]: array to sort %/ <<widget "SlaveIDSort">> @@ -604,7 +604,7 @@ $args[0]: array to sort <</widget>> /% - Call as <<SlaveIndexSort [$slaveIndxs]>> + Call as <<SlaveIndexSort [slaveIndxs]>> $args[0]: array to sort %/ <<widget "SlaveIndexSort">>