diff --git a/src/SecExp/js/secExp.js b/src/SecExp/js/secExp.js index 6b13e31ac64f5dc980caeea6f8da470b5c11884c..200d5d5e7efeff30bd3b9d9b4cd62cb518e9e853 100644 --- a/src/SecExp/js/secExp.js +++ b/src/SecExp/js/secExp.js @@ -772,6 +772,8 @@ App.SecExp.Check = (function() { return Req; } +})(); + App.SecExp.unit = (function() { return { dec:description, diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index a0dc8d3c482476e2e434f451e4d186d3c27b0899..88aa0bff1abede941af7e0193ae55e83650e0f16 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1756,18 +1756,6 @@ extremely pale -5 <<set $AgeTrainingLowerBoundPC = 14, $AgeTrainingUpperBoundPC = 16, $AgeEffectOnTrainerPricingPC = .75, $AgeEffectOnTrainerEffectivenessPC = .75>> <<case 8>> <<set $AgeTrainingLowerBoundPC = 13, $AgeTrainingUpperBoundPC = 15, $AgeEffectOnTrainerPricingPC = .85, $AgeEffectOnTrainerEffectivenessPC = .85>> -<<case 3>> - <<set $AgeTrainingLowerBounds = 18, $AgeTrainingUpperBounds = 20, $AgePricing = .1, $AgeTrainingEffect = .1>> -<<case 4>> - <<set $AgeTrainingLowerBounds = 17, $AgeTrainingUpperBounds = 19, $AgePricing = .15, $AgeTrainingEffect = .15>> -<<case 5>> - <<set $AgeTrainingLowerBounds = 16, $AgeTrainingUpperBounds = 18, $AgePricing = .35, $AgeTrainingEffect = .35>> -<<case 6>> - <<set $AgeTrainingLowerBounds = 15, $AgeTrainingUpperBounds = 17, $AgePricing = .55, $AgeTrainingEffect = .55>> -<<case 7>> - <<set $AgeTrainingLowerBounds = 14, $AgeTrainingUpperBounds = 16, $AgePricing = .75, $AgeTrainingEffect = .75>> -<<case 8>> - <<set $AgeTrainingLowerBounds = 13, $AgeTrainingUpperBounds = 15, $AgePricing = .85, $AgeTrainingEffect = .85>> <<case 9>> <<set $AgeTrainingLowerBoundPC = 12, $AgeTrainingUpperBoundPC = 14, $AgeEffectOnTrainerPricingPC = 1.00, $AgeEffectOnTrainerEffectivenessPC = 1.00>> <<case 10>> diff --git a/src/uncategorized/rename.tw b/src/uncategorized/rename.tw index 4bd1508499072bd4ee0efb128192ab69dd51889b..cb509f3a258be23b2bd0be4cfb754b508dbba724 100644 --- a/src/uncategorized/rename.tw +++ b/src/uncategorized/rename.tw @@ -11,7 +11,7 @@ <<set $activeSlave.slaveName = $oldName>> <<elseif $activeSlave.fetish == "mindbroken">> $activeSlave.slaveName doesn't even recognize that $he's been renamed. It simply does not register. -<<elseif ($oldName != $activeSlave.birthName && $oldSurname != $activeSlave.birthSurname) && ($activeSlave.slaveName == $activeSlave.birthName || $activeSlave.slaveSurname == $activeSlave.birthSurname)>> +<<elseif ($oldName != $activeSlave.birthName && $activeSlave.slaveName == $activeSlave.birthName) || ($oldSurname != $activeSlave.birthSurname && $activeSlave.slaveSurname == $activeSlave.birthSurname)>> $activeSlave.slaveName <<if $activeSlave.devotion > 50>> cheerfully accepts $his old name back. @@ -25,7 +25,7 @@ <<else>> cautiously accepts the return of $his name. <</if>> -<<elseif $oldName == $activeSlave.birthName || $oldSurname == $activeSlave.birthSurname>> +<<elseif ($oldName == $activeSlave.birthName && $activeSlave.slaveName != $activeSlave.birthName) || ($oldSurname == $activeSlave.birthSurname && $activeSlave.slaveSurname != $activeSlave.birthSurname)>> $activeSlave.slaveName <<if $activeSlave.devotion > 50>> accepts $his new name cheerfully. This attachment to you @@.hotpink; increases $his devotion.@@