diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 16b93a3a20b0d956dccb1aee2e316d7329757de7..9159658c014bf5a16e4825498bbbf67949750eab 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.0/1 +2/11/18 + + 339 + -FCanon's fixes + -fixed some display issues involving $PC.customTitle + 2/10/18 338 diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index c4a8bd13045d013e7297b83ceaa833eec41d97d3..6dc94b1f0115f2fea38b4388d12a4923fd2c8cf6 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2773,6 +2773,9 @@ Specialized creams built off of stem cells and several ingredients known for red <<case "The Flesh Heap">> More of a trash heap than a slave market, the "Flesh Heap" is a dumping ground for thoroughly broken slaves. Relatively healthy bodies are usually scooped up for medical testing or other purposes; several that one wouldn't want to waste a valuable slave on. Anything with some sort of life in it is up for sale, usually at extremely low prices, though one gets what they pay for; most slaves are nothing more than vegetables. One would have to place a reserve should they want a mindless, healthy slave for whatever they seek. +<<case "The Job Fulfillment Center">> +If you are looking for a slave for a slave qualified for a specific role, look no further than the Traders Union that makes up the Job Fulfillment Center. Leave the job description and a list of desired traits and before long a suitable slave will be delivered to your doorstep and ready to serve you. Due to the nature of the business, these slaves are not cheap and usually not perfect, but they always fulfill their job adequately and obediantly. + <<case "Gestation Drugs and Labor Suppressants">> Not all drugs are applied directly to your slavegirl. In this case, gestation accelerants and deccelerants are passed through the mother into her unborn children to control the rate of fetal growth. While slightly unhealthy for the mother, gestation slowing drugs are relatively harmless, though an unwilling mother may become more distraut when she realizes her pregnancy will last even longer. Due to the extended duration of the pregnancy, the mother's body may become accustomed to being so round, leading towards a sagging middle once birth occurs. On the other hand, gestation hastening drugs are extremely dangerous to the mother. It is strongly recommended to keep her under the observation and care of an experienced doctor or nurse. Failure to do so will cause her body to struggle to keep up with the rate of growth of her children, harming her physical and mental health, as well as potentially bursting her uterus later in her pregnancy. Labor suppresants are exactly that; they prevent the mother from entering labor, thus allowing the child to grow longer than a normal pregnancy. Excessive use may lead to health complications, especially during childbirth, though going even further may result in the slave's body suddenly entering labor and rapidly birthing her children, often without giving the slave time to prepare or even get undressed. @@ -3190,7 +3193,7 @@ Game Mods: <br>The Security Expansion Mod: [[Security Expansion|Encyclopedia][$encyclopedia = "Security Expansion"]] | [[Battles in Security Expansion|Encyclopedia][$encyclopedia = "Battles"]] <</if>> -<br>Pregmod: <<link "Repopulationism">><<set $encyclopedia = "Repopulationism">><<goto "Encyclopedia">><</link>> | <<link "Eugenics Focus">><<set $encyclopedia = "Eugenics Focus">><<goto "Encyclopedia">><</link>> | <<link "Hedonistic Decadence">><<set $encyclopedia = "Hedonistic Decadence">><<goto "Encyclopedia">><</link>> | <<link "Gender Radicalism research">><<set $encyclopedia = "Gender Radicalism research">><<goto "Encyclopedia">><</link>> | <<link "Transformation Fetishism research">><<set $encyclopedia = "Transformation Fetishism research">><<goto "Encyclopedia">><</link>> | <<link "Asset Expansionist research">><<set $encyclopedia = "Asset Expansionist research">><<goto "Encyclopedia">><</link>> | <<link "Slimness Enthusiast research">><<set $encyclopedia = "Slimness Enthusiast research">><<goto "Encyclopedia">><</link>> | <<link "Youth Preferentialism Research">><<set $encyclopedia = "Youth Preferentialism Research">><<goto "Encyclopedia">><</link>> | <<link "Hedonistic Decadence Research">><<set $encyclopedia = "Hedonistic Decadence Research">><<goto "Encyclopedia">><</link>> | <<link "Eugenics Breeding Proposal">><<set $encyclopedia = "Eugenics Breeding Proposal">><<goto "Encyclopedia">><</link>> | <<link "Repopulationist Breeding School">><<set $encyclopedia = "Repopulationist Breeding School">><<goto "Encyclopedia">><</link>> | <<link "Escort">><<set $encyclopedia = "Escort">><<goto "Encyclopedia">><</link>> | <<link "Servant">><<set $encyclopedia = "Servant">><<goto "Encyclopedia">><</link>> | <<link "Gang Leader">><<set $encyclopedia = "Gang Leader">><<goto "Encyclopedia">><</link>> | <<link "Hyper-pregnancy">><<set $encyclopedia = "Hyper-pregnancy">><<goto "Encyclopedia">><</link>> | <<link "Super Fertility Drugs">><<set $encyclopedia = "Super Fertility Drugs">><<goto "Encyclopedia">><</link>> | <<link "Pregnancy Generator">><<set $encyclopedia = "Pregnancy Generator">><<goto "Encyclopedia">><</link>> | <<link "Childbirth and C-Secs">><<set $encyclopedia = "Childbirth and C-Secs">><<goto "Encyclopedia">><</link>> | <<link "Enemas and Force-Feeding">><<set $encyclopedia = "Enemas and Force-Feeding">><<goto "Encyclopedia">><</link>> | <<link "Belly Implants">><<set $encyclopedia = "Belly Implants">><<goto "Encyclopedia">><</link>> | <<link "Cervix Micropump Filter">><<set $encyclopedia = "Cervix Micropump Filter">><<goto "Encyclopedia">><</link>> | <<link "Organic Mesh Breast Implant">><<set $encyclopedia = "Organic Mesh Breast Implant">><<goto "Encyclopedia">><</link>> | <<link "Ejaculation Boosting Prostate Implant">><<set $encyclopedia = "Ejaculation Boosting Prostate Implant">><<goto "Encyclopedia">><</link>> | <<link "Player Pregnancy">><<set $encyclopedia = "Player Pregnancy">><<goto "Encyclopedia">><</link>> | <<link "The Flesh Heap">><<set $encyclopedia = "The Flesh Heap">><<goto "Encyclopedia">><</link>> | <<link "Gestation Drugs and Labor Suppressants">><<set $encyclopedia = "Gestation Drugs and Labor Suppressants">><<goto "Encyclopedia">><</link>> +<br>Pregmod: <<link "Repopulationism">><<set $encyclopedia = "Repopulationism">><<goto "Encyclopedia">><</link>> | <<link "Eugenics Focus">><<set $encyclopedia = "Eugenics Focus">><<goto "Encyclopedia">><</link>> | <<link "Hedonistic Decadence">><<set $encyclopedia = "Hedonistic Decadence">><<goto "Encyclopedia">><</link>> | <<link "Gender Radicalism research">><<set $encyclopedia = "Gender Radicalism research">><<goto "Encyclopedia">><</link>> | <<link "Transformation Fetishism research">><<set $encyclopedia = "Transformation Fetishism research">><<goto "Encyclopedia">><</link>> | <<link "Asset Expansionist research">><<set $encyclopedia = "Asset Expansionist research">><<goto "Encyclopedia">><</link>> | <<link "Slimness Enthusiast research">><<set $encyclopedia = "Slimness Enthusiast research">><<goto "Encyclopedia">><</link>> | <<link "Youth Preferentialism Research">><<set $encyclopedia = "Youth Preferentialism Research">><<goto "Encyclopedia">><</link>> | <<link "Hedonistic Decadence Research">><<set $encyclopedia = "Hedonistic Decadence Research">><<goto "Encyclopedia">><</link>> | <<link "Eugenics Breeding Proposal">><<set $encyclopedia = "Eugenics Breeding Proposal">><<goto "Encyclopedia">><</link>> | <<link "Repopulationist Breeding School">><<set $encyclopedia = "Repopulationist Breeding School">><<goto "Encyclopedia">><</link>> | <<link "Escort">><<set $encyclopedia = "Escort">><<goto "Encyclopedia">><</link>> | <<link "Servant">><<set $encyclopedia = "Servant">><<goto "Encyclopedia">><</link>> | <<link "Gang Leader">><<set $encyclopedia = "Gang Leader">><<goto "Encyclopedia">><</link>> | <<link "Hyper-pregnancy">><<set $encyclopedia = "Hyper-pregnancy">><<goto "Encyclopedia">><</link>> | <<link "Super Fertility Drugs">><<set $encyclopedia = "Super Fertility Drugs">><<goto "Encyclopedia">><</link>> | <<link "Pregnancy Generator">><<set $encyclopedia = "Pregnancy Generator">><<goto "Encyclopedia">><</link>> | <<link "Childbirth and C-Secs">><<set $encyclopedia = "Childbirth and C-Secs">><<goto "Encyclopedia">><</link>> | <<link "Enemas and Force-Feeding">><<set $encyclopedia = "Enemas and Force-Feeding">><<goto "Encyclopedia">><</link>> | <<link "Belly Implants">><<set $encyclopedia = "Belly Implants">><<goto "Encyclopedia">><</link>> | <<link "Cervix Micropump Filter">><<set $encyclopedia = "Cervix Micropump Filter">><<goto "Encyclopedia">><</link>> | <<link "Organic Mesh Breast Implant">><<set $encyclopedia = "Organic Mesh Breast Implant">><<goto "Encyclopedia">><</link>> | <<link "Ejaculation Boosting Prostate Implant">><<set $encyclopedia = "Ejaculation Boosting Prostate Implant">><<goto "Encyclopedia">><</link>> | <<link "Player Pregnancy">><<set $encyclopedia = "Player Pregnancy">><<goto "Encyclopedia">><</link>> | <<link "The Flesh Heap">><<set $encyclopedia = "The Flesh Heap">><<goto "Encyclopedia">><</link>> | <<link "The Job Fulfillment Center">><<set $encyclopedia = "The Job Fulfillment Center">><<goto "Encyclopedia">><</link>> | <<link "Gestation Drugs and Labor Suppressants">><<set $encyclopedia = "Gestation Drugs and Labor Suppressants">><<goto "Encyclopedia">><</link>> <br>Lolimod: <<link "Lolis and the Free Cities">><<set $encyclopedia = "Lolis and the Free Cities">><<goto "Encyclopedia">><</link>> | <<link "Fertility Age">><<set $encyclopedia = "Fertility Age">><<goto "Encyclopedia">><</link>> | <<link "Male Fertility">><<set $encyclopedia = "Male Fertility">><<goto "Encyclopedia">><</link>> | <<link "Precocious Puberty">><<set $encyclopedia = "Precocious Puberty">><<goto "Encyclopedia">><</link>> | <<link "Cradle Robbers">><<set $encyclopedia = "Cradle Robbers">><<goto "Encyclopedia">><</link>> | <<link "The Incubation Facility">><<set $encyclopedia = "The Incubation Facility">><<goto "Encyclopedia">><</link>> <br>FCTV mod: <<link "FCTV">><<set $encyclopedia = "FCTV">><<goto "Encyclopedia">><</link>> | <<link "FCTVReceiver">><<set $encyclopedia = "FCTVReceiver">><<goto "Encyclopedia">><</link>> <<if $secExp == 1>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 031dc93e7515f7b3cf9f74f08e1e0afc12c10d73..8ee2e79f1e40f200e3f10a46681d2ba0eff6e6ef 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -4465,7 +4465,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?" <<if $mutinery != 1>> <br><<link "Lock her dick in chastity">> <<replace "#result2">> - You simply clamp a chastity cage onto her limp dick; she'll be taking a little break from fucking girls for the time being. When she comes to and finds herself locked in chastity, immediately begins fiddling with it in an attempt to remove it. She feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. + You simply clamp a chastity cage onto her limp dick; she'll be taking a little break from fucking girls for the time being. When she comes to and finds herself locked in chastity, immediately begins fiddling with it in an attempt to remove it. She feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. <<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">> <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> <</replace>> @@ -4535,7 +4535,7 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?" <<if $mutinery != 1>> <br><<link "Lock her dick in chastity">> <<replace "#result2">> - You simply clamp a chastity cage onto her limp dick; she'll be taking a little break from fucking girls for the time being. When she comes to and finds herself locked in chastity, immediately begins fiddling with it in an attempt to remove it. She feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if $PC.customTitle != 0>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. + You simply clamp a chastity cage onto her limp dick; she'll be taking a little break from fucking girls for the time being. When she comes to and finds herself locked in chastity, immediately begins fiddling with it in an attempt to remove it. She feels this punishment is laughable and only @@.mediumaquamarine;grows more defiant.@@ Word spreads through your chattel that the only downside of trying to rape <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title == 1>>Master<<else>>Mistress<</if>> is getting locked in chastity, @@.mediumaquamarine;spreading defiance@@ through your rebellious slaves. <<set $activeSlave.trust += 10, $activeSlave.dickAccessory = "chastity">> <<set $slaves.forEach(function(s) { if (s.devotion <= -50) { s.trust += 5; } })>> <</replace>> diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 1d652f39160ad148e32cbd1f45af013ea52463e1..d490b59904800cb122d49fe2d76374f163a982e6 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -12,11 +12,12 @@ <<if $useTabs == 0>>__The Corporation__<</if>> <br> +<<set _totalShares = ($personalShares+$publicShares)>> <<set _roll = random(1,100)>> <<set $corpPeopleEnslaved += 1>> <<set $corpValue = $corpCash + ($generalAssets*$generalAssetPrice)+($slaveAssets*$slaveAssetPrice)+($entrapmentAssets*$entrapmentAssetPrice)+($captureAssets*$captureAssetPrice)+($trainingAssets*$trainingAssetPrice)+($surgicalAssets*$surgicalAssetPrice)+($drugAssets*$drugAssetPrice)>> -<<set $corpProfit = Math.max(0, Math.trunc( 6666666 / (1 + Math.exp(-0.8 * (Math.log($corpValue) - 22))) ) - random(666, 6666))>> /* formula caps at 6666666, reaches 6.5 million at corpValue of 10 to the 12th power */ +<<set $corpProfit = Math.max(0, Math.trunc( 6666666 / (1 + Math.exp(-1.4 * (Math.log($corpValue) - 18))) ) - random(666, 6666))>> /* formula caps at 6666666, reaches 6.5 million at corpValue of 900 million */ <<set $corpCash = Math.trunc($corpCash + $corpProfit)>> Your corporation was valued at <<print cashFormat($corpValue)>> and made a profit of <<print cashFormat($corpProfit)>> last week. <<set _addedSlaves = Math.ceil(Math.log($captureAssets+$entrapmentAssets))>> @@ -51,17 +52,17 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p <<set _drugWeight = 0.1, _trainingWeight += 0.1>> <</if>> <<set _improvementAssetsTotal = ($trainingAssets * _trainingWeight) + ($surgicalAssets * _surgicalWeight) + ($drugAssets * _drugWeight)>> -<<if _improvementAssetsTotal > $slaveAssets * 0.4>> +<<if _improvementAssetsTotal > $slaveAssets * 0.6>> The corporation has enough training and medical assets to rapidly improve its human holdings. - <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*400)>> -<<elseif _improvementAssetsTotal > $slaveAssets * 0.2>> + <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*800)>> +<<elseif _improvementAssetsTotal > $slaveAssets * 0.4>> The corporation uses its training and medical assets to improve its human holdings. - <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*200)>> + <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)*400)>> <<else>> The corporation has only enough training and medical assets to maintain the value of its human holdings. <</if>> /* model weekly corporate expenses as random 1-3% reduction in all asset types (including cash) ... except slaves, whose value is tied to $slaveCostFactor (which the corporation does not affect) */ -<<set $trainingAssets = Math.ceil($trainingAssets * random(97,99)/100), $surgicalAssets = Math.ceil($surgicalAssets * random(97,99)/100), $drugAssets = Math.ceil($drugAssets * random(97,99)/100), $generalAssets = Math.ceil($generalAssets * random(97,99)/100), $entrapmentAssets = Math.ceil($entrapmentAssets * random(97,99)/100), $captureAssets = Math.ceil($captureAssets * random(97,99)/100), $corpCash = Math.ceil($corpCash * random(97,99)/100)>> +<<set $trainingAssets = Math.max(Math.ceil($trainingAssets * random(97,99)/100), 500), $surgicalAssets = Math.max(Math.ceil($surgicalAssets * random(97,99)/100), 500), $drugAssets = Math.max(Math.ceil($drugAssets * random(97,99)/100), 500), $generalAssets = Math.max(Math.ceil($generalAssets * random(97,99)/100), 500), $entrapmentAssets = Math.max(Math.ceil($entrapmentAssets * random(97,99)/100), 500), $captureAssets = Math.max(Math.ceil($captureAssets * random(97,99)/100), 500), $corpCash = Math.ceil($corpCash * random(97,99)/100)>> <<if $corpMarket>> <<if $rep > 5000>> <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)/Math.log(10)*(($rep-5000)/15000)*200)>> @@ -78,34 +79,41 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p enhances the value of its slaves. <</if>> <</if>> -<<if $corpProfit > ($personalShares+$publicShares)*30>> - Since it is incredibly profitable, a massive dividend of ¤3/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*3)>>@@. - <<set $cash += $personalShares*3, $corpCash -= ($personalShares+$publicShares)*3>> -<<elseif $corpProfit > ($personalShares+$publicShares)*20>> - Since it is extremely profitable, a huge dividend of ¤2/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*2)>>@@. - <<set $cash += $personalShares*2, $corpCash -= ($personalShares+$publicShares)*2>> -<<elseif $corpProfit > ($personalShares+$publicShares)*10>> - Since it is highly profitable, a large dividend of ¤1/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares)>>@@. - <<set $cash += $personalShares, $corpCash -= ($personalShares+$publicShares)>> -<<elseif $corpProfit > ($personalShares+$publicShares)*5>> - Since it is very profitable, a moderate dividend of ¤0.5/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.5)>>@@. - <<set $cash += Math.trunc($personalShares*0.5), $corpCash -= Math.trunc(($personalShares+$publicShares)*0.5)>> -<<elseif $corpProfit > ($personalShares+$publicShares)*2>> - Since it is moderately profitable, a reasonable dividend of ¤0.2/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.2)>>@@. - <<set $cash += Math.trunc($personalShares*0.2), $corpCash -= Math.trunc(($personalShares+$publicShares)*0.2)>> -<<elseif $corpProfit > ($personalShares+$publicShares)>> - Since it is acceptably profitable, a small dividend of ¤0.1/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.1)>>@@. - <<set $cash += Math.trunc($personalShares*0.1), $corpCash -= Math.trunc(($personalShares+$publicShares)*0.1)>> -<<elseif $corpProfit > 200>> - Since it is barely profitable, a tiny dividend was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat(1+Math.ceil(($corpProfit*0.01*$personalShares)/($personalShares+$publicShares)))>>@@. - <<set $cash += 1+Math.ceil(($corpProfit*0.01*$personalShares)/($personalShares+$publicShares)), $corpCash -= Math.trunc($corpProfit*0.01)>> +<<set _dividendPerShare = 0.2 * $corpProfit / _totalShares>> +<<if _dividendPerShare > 5>> + Since it is incredibly profitable, a massive dividend of ¤5/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*5)>>@@. + <<set $cash += $personalShares*5, $corpCash -= _totalShares*5>> +<<elseif _dividendPerShare > 3>> + Since it is extremely profitable, a huge dividend of ¤3/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*3)>>@@. + <<set $cash += $personalShares*3, $corpCash -= _totalShares*3>> +<<elseif _dividendPerShare > 2>> + Since it is highly profitable, a huge dividend of ¤2/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*2)>>@@. + <<set $cash += $personalShares*2, $corpCash -= _totalShares*2>> +<<elseif _dividendPerShare > 1>> + Since it is very profitable, a large dividend of ¤1/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares)>>@@. + <<set $cash += $personalShares, $corpCash -= _totalShares>> +<<elseif _dividendPerShare > 0.5>> + Since it is quite profitable, a moderate dividend of ¤0.5/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.5)>>@@. + <<set $cash += Math.trunc($personalShares*0.5), $corpCash -= Math.trunc(_totalShares*0.5)>> +<<elseif _dividendPerShare > 0.3>> + Since it is acceptably profitable, a reasonable dividend of ¤0.3/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.3)>>@@. + <<set $cash += Math.trunc($personalShares*0.3), $corpCash -= Math.trunc(_totalShares*0.3)>> +<<elseif _dividendPerShare > 0.2>> + Since it is moderately profitable, a modest dividend of ¤0.2/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.2)>>@@. + <<set $cash += Math.trunc($personalShares*0.2), $corpCash -= (_totalShares*0.2)>> +<<elseif _dividendPerShare > 0.1>> + Since it is modestly profitable, a small dividend of ¤0.1/share was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat($personalShares*0.1)>>@@. + <<set $cash += Math.trunc($personalShares*0.1), $corpCash -= Math.trunc(_totalShares*0.1)>> +<<elseif $corpProfit > 0>> + Since its profits per share are low, a meager dividend was paid out to stockholders; you received @@.yellowgreen;<<print cashFormat(1+Math.ceil(($corpProfit*0.2*$personalShares)/_totalShares))>>@@. + <<set $cash += 1+Math.ceil(($corpProfit*0.2*$personalShares)/_totalShares), $corpCash -= Math.trunc($corpProfit*0.2)>> <</if>> <<set _roll = random(1,100)>> -<<if $sharePrice*($personalShares+$publicShares) < $corpValue*0.01>> /* market cap is less than 1% of assets */ +<<if $sharePrice*_totalShares < $corpValue*0.2>> /* market cap is less than 20% of value of assets */ The market consensus is that your corporation is undervalued, driving share prices sharply up. - <<set $sharePrice = Math.ceil($sharePrice*random(102,104))/100>> /* 2-4% rise */ + <<set $sharePrice = Math.ceil($sharePrice*random(105,108))/100>> /* 5-8% rise */ <<elseif random(1,100) < $rep/2000>> /* up to 10% chance */ Share prices in your corporation are driven up by your reputation. <<set $sharePrice = Math.ceil($sharePrice*either(101,103))/100>> /* 1-3% rise */ @@ -115,9 +123,9 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p <<elseif _roll > 80>> /* 20% chance */ Market volatility drives share prices up. <<set $sharePrice = Math.ceil($sharePrice*either(101,102))/100>> /* 1-2% rise */ -<<elseif $sharePrice*($personalShares+$publicShares) > $corpValue*0.05>> /* market cap is more than 5% of assets */ +<<elseif $sharePrice*_totalShares > $corpValue>> /* market cap is more than 80% of value of assets */ The market consensus is that your corporation is overvalued, driving share prices sharply down. - <<set $sharePrice = Math.ceil($sharePrice*random(95,97))/100>> /* 3-5% drop */ + <<set $sharePrice = Math.ceil($sharePrice*random(92,95))/100>> /* 5-8% drop */ <</if>> Shares in your corporation are trading at <<print cashFormat($sharePrice)>>: @@ -133,8 +141,8 @@ Shares in your corporation are trading at <<print cashFormat($sharePrice)>>: <<set $oldSharePrice = Math.ceil($sharePrice)>> You hold <<print commaNum($personalShares)>> shares personally while <<print commaNum($publicShares)>> are publicly held. -<<set _PrivateOwnershipPercentage = Math.trunc(($personalShares/($personalShares+$publicShares))*100)>> -<<set _PublicOwnershipPercentage = Math.trunc(($publicShares/($personalShares+$publicShares))*100)>> +<<set _PrivateOwnershipPercentage = Math.trunc(($personalShares/_totalShares)*100)>> +<<set _PublicOwnershipPercentage = Math.trunc(($publicShares/_totalShares)*100)>> <span id="CorpAction"> <br><br> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index c2f0bea0d1d6ee6ec35621bd6101ecce4824ca84..6d455b932676fed6ac89bad7a4385010508cbe49 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -2025,122 +2025,122 @@ This experience <<switch $args[0]>> <<case "Supremacist">> - <<if $arcologies[0].FSSupremacist != "unset">> + <<if isInt($arcologies[0].FSSupremacist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSSupremacist/$FSLockinLevel)>> <<set $arcologies[0].FSSupremacist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Subjugationist">> - <<if $arcologies[0].FSSubjugationist != "unset">> + <<if isInt($arcologies[0].FSSubjugationist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSSubjugationist/$FSLockinLevel)>> <<set $arcologies[0].FSSubjugationist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "GenderRadicalist">> - <<if $arcologies[0].FSGenderRadicalist != "unset">> + <<if isInt($arcologies[0].FSGenderRadicalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel)>> <<set $arcologies[0].FSGenderRadicalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "GenderFundamentalist">> - <<if $arcologies[0].FSGenderFundamentalist != "unset">> + <<if isInt($arcologies[0].FSGenderFundamentalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSGenderFundamentalist/$FSLockinLevel)>> <<set $arcologies[0].FSGenderFundamentalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Paternalist">> - <<if $arcologies[0].FSPaternalist != "unset">> + <<if isInt($arcologies[0].FSPaternalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel)>> <<set $arcologies[0].FSPaternalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Degradationist">> - <<if $arcologies[0].FSDegradationist != "unset">> + <<if isInt($arcologies[0].FSDegradationist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSDegradationist/$FSLockinLevel)>> <<set $arcologies[0].FSDegradationist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "AssetExpansionist">> - <<if $arcologies[0].FSAssetExpansionist != "unset">> + <<if isInt($arcologies[0].FSAssetExpansionist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSAssetExpansionist/$FSLockinLevel)>> <<set $arcologies[0].FSAssetExpansionist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "SlimnessEnthusiast">> - <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> + <<if isInt($arcologies[0].FSSlimnessEnthusiast)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSSlimnessEnthusiast/$FSLockinLevel)>> <<set $arcologies[0].FSSlimnessEnthusiast += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "TransformationFetishist">> - <<if $arcologies[0].FSTransformationFetishist != "unset">> + <<if isInt($arcologies[0].FSTransformationFetishist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSTransformationFetishist/$FSLockinLevel)>> <<set $arcologies[0].FSTransformationFetishist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "BodyPurist">> - <<if $arcologies[0].FSBodyPurist != "unset">> + <<if isInt($arcologies[0].FSBodyPurist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSBodyPurist/$FSLockinLevel)>> <<set $arcologies[0].FSBodyPurist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "MaturityPreferentialist">> - <<if $arcologies[0].FSMaturityPreferentialist != "unset">> + <<if isInt($arcologies[0].FSMaturityPreferentialist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSMaturityPreferentialist/$FSLockinLevel)>> <<set $arcologies[0].FSMaturityPreferentialist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "YouthPreferentialist">> - <<if $arcologies[0].FSYouthPreferentialist != "unset">> + <<if isInt($arcologies[0].FSYouthPreferentialist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSYouthPreferentialist/$FSLockinLevel)>> <<set $arcologies[0].FSYouthPreferentialist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Pastoralist">> - <<if $arcologies[0].FSPastoralist != "unset">> + <<if isInt($arcologies[0].FSPastoralist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSPastoralist/$FSLockinLevel)>> <<set $arcologies[0].FSPastoralist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "PhysicalIdealist">> - <<if $arcologies[0].FSPhysicalIdealist != "unset">> + <<if isInt($arcologies[0].FSPhysicalIdealist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSPhysicalIdealist/$FSLockinLevel)>> <<set $arcologies[0].FSPhysicalIdealist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "ChattelReligionist">> - <<if $arcologies[0].FSChattelReligionist != "unset">> + <<if isInt($arcologies[0].FSChattelReligionist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel)>> <<set $arcologies[0].FSChattelReligionist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "RomanRevivalist">> - <<if $arcologies[0].FSRomanRevivalist != "unset">> + <<if isInt($arcologies[0].FSRomanRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRomanRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSRomanRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "AztecRevivalist">> - <<if $activeArcology.FSAztecRevivalist != "unset">> + <<if isInt($activeArcology.FSAztecRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSAztecRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSAztecRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "EgyptianRevivalist">> - <<if $arcologies[0].FSEgyptianRevivalist != "unset">> + <<if isInt($arcologies[0].FSEgyptianRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSEgyptianRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "EdoRevivalist">> - <<if $arcologies[0].FSEdoRevivalist != "unset">> + <<if isInt($arcologies[0].FSEdoRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSEdoRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSEdoRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "ArabianRevivalist">> - <<if $arcologies[0].FSArabianRevivalist != "unset">> + <<if isInt($arcologies[0].FSArabianRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSArabianRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSArabianRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "ChineseRevivalist">> - <<if $arcologies[0].FSChineseRevivalist != "unset">> + <<if isInt($arcologies[0].FSChineseRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSChineseRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSChineseRevivalist += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Repopulationist">> - <<if $arcologies[0].FSRepopulationFocus != "unset">> + <<if isInt($arcologies[0].FSRepopulationFocus)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRepopulationFocus/$FSLockinLevel)>> <<set $arcologies[0].FSRepopulationFocus += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Eugenics">> - <<if $arcologies[0].FSRestart != "unset">> + <<if isInt($arcologies[0].FSRestart)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>> <<set $arcologies[0].FSRestart += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> <<case "Hedonism">> - <<if $arcologies[0].FSHedonisticDecadence != "unset">> + <<if isInt($arcologies[0].FSHedonisticDecadence)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSHedonisticDecadence/$FSLockinLevel)>> <<set $arcologies[0].FSHedonisticDecadence += 0.05*$args[1]*$FSSingleSlaveRep>> <</if>> @@ -2159,122 +2159,122 @@ This experience <<switch $args[0]>> <<case "Supremacist">> - <<if $arcologies[0].FSSupremacist != "unset">> + <<if isInt($arcologies[0].FSSupremacist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSSupremacist/$FSLockinLevel)>> <<set $arcologies[0].FSSupremacist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Subjugationist">> - <<if $arcologies[0].FSSubjugationist != "unset">> + <<if isInt($arcologies[0].FSSubjugationist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSSubjugationist/$FSLockinLevel)>> <<set $arcologies[0].FSSubjugationist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "GenderRadicalist">> - <<if $arcologies[0].FSGenderRadicalist != "unset">> + <<if isInt($arcologies[0].FSGenderRadicalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSGenderRadicalist/$FSLockinLevel)>> <<set $arcologies[0].FSGenderRadicalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "GenderFundamentalist">> - <<if $arcologies[0].FSGenderFundamentalist != "unset">> + <<if isInt($arcologies[0].FSGenderFundamentalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSGenderFundamentalist/$FSLockinLevel)>> <<set $arcologies[0].FSGenderFundamentalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Paternalist">> - <<if $arcologies[0].FSPaternalist != "unset">> + <<if isInt($arcologies[0].FSPaternalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSPaternalist/$FSLockinLevel)>> <<set $arcologies[0].FSPaternalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Degradationist">> - <<if $arcologies[0].FSDegradationist != "unset">> + <<if isInt($arcologies[0].FSDegradationist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSDegradationist/$FSLockinLevel)>> <<set $arcologies[0].FSDegradationist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "AssetExpansionist">> - <<if $arcologies[0].FSAssetExpansionist != "unset">> + <<if isInt($arcologies[0].FSAssetExpansionist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSAssetExpansionist/$FSLockinLevel)>> <<set $arcologies[0].FSAssetExpansionist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "SlimnessEnthusiast">> - <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> + <<if isInt($arcologies[0].FSSlimnessEnthusiast)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSSlimnessEnthusiast/$FSLockinLevel)>> <<set $arcologies[0].FSSlimnessEnthusiast += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "TransformationFetishist">> - <<if $arcologies[0].FSTransformationFetishist != "unset">> + <<if isInt($arcologies[0].FSTransformationFetishist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSTransformationFetishist/$FSLockinLevel)>> <<set $arcologies[0].FSTransformationFetishist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "BodyPurist">> - <<if $arcologies[0].FSBodyPurist != "unset">> + <<if isInt($arcologies[0].FSBodyPurist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSBodyPurist/$FSLockinLevel)>> <<set $arcologies[0].FSBodyPurist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "MaturityPreferentialist">> - <<if $arcologies[0].FSMaturityPreferentialist != "unset">> + <<if isInt($arcologies[0].FSMaturityPreferentialist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSMaturityPreferentialist/$FSLockinLevel)>> <<set $arcologies[0].FSMaturityPreferentialist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "YouthPreferentialist">> - <<if $arcologies[0].FSYouthPreferentialist != "unset">> + <<if isInt($arcologies[0].FSYouthPreferentialist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSYouthPreferentialist/$FSLockinLevel)>> <<set $arcologies[0].FSYouthPreferentialist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Pastoralist">> - <<if $arcologies[0].FSPastoralist != "unset">> + <<if isInt($arcologies[0].FSPastoralist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSPastoralist/$FSLockinLevel)>> <<set $arcologies[0].FSPastoralist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "PhysicalIdealist">> - <<if $arcologies[0].FSPhysicalIdealist != "unset">> + <<if isInt($arcologies[0].FSPhysicalIdealist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSPhysicalIdealist/$FSLockinLevel)>> <<set $arcologies[0].FSPhysicalIdealist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "ChattelReligionist">> - <<if $arcologies[0].FSChattelReligionist != "unset">> + <<if isInt($arcologies[0].FSChattelReligionist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSChattelReligionist/$FSLockinLevel)>> <<set $arcologies[0].FSChattelReligionist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "RomanRevivalist">> - <<if $arcologies[0].FSRomanRevivalist != "unset">> + <<if isInt($arcologies[0].FSRomanRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRomanRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSRomanRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "AztecRevivalist">> - <<if $activeArcology.FSAztecRevivalist != "unset">> + <<if isInt($activeArcology.FSAztecRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSAztecRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSAztecRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "EgyptianRevivalist">> - <<if $arcologies[0].FSEgyptianRevivalist != "unset">> + <<if isInt($arcologies[0].FSEgyptianRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSEgyptianRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSEgyptianRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "EdoRevivalist">> - <<if $arcologies[0].FSEdoRevivalist != "unset">> + <<if isInt($arcologies[0].FSEdoRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSEdoRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSEdoRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "ArabianRevivalist">> - <<if $arcologies[0].FSArabianRevivalist != "unset">> + <<if isInt($arcologies[0].FSArabianRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSArabianRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSArabianRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "ChineseRevivalist">> - <<if $arcologies[0].FSChineseRevivalist != "unset">> + <<if isInt($arcologies[0].FSChineseRevivalist)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSChineseRevivalist/$FSLockinLevel)>> <<set $arcologies[0].FSChineseRevivalist += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Repopulationist">> - <<if $arcologies[0].FSRepopulationFocus != "unset">> + <<if isInt($arcologies[0].FSRepopulationFocus)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRepopulationFocus/$FSLockinLevel)>> <<set $arcologies[0].FSRepopulationFocus += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Eugenics">> - <<if $arcologies[0].FSRestart != "unset">> + <<if isInt($arcologies[0].FSRestart)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSRestart/$FSLockinLevel)>> <<set $arcologies[0].FSRestart += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> <<case "Hedonism">> - <<if $arcologies[0].FSHedonisticDecadence != "unset">> + <<if isInt($arcologies[0].FSHedonisticDecadence)>> <<set $rep += $args[1]*$FSSingleSlaveRep*($arcologies[0].FSHedonisticDecadence/$FSLockinLevel)>> <<set $arcologies[0].FSHedonisticDecadence += 0.05*$args[1]*$FSSingleSlaveRep*$pornFameBonus>> <</if>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 5bf56b09bc3ad2c7e1670fef8cd8bb296acc4f27..d649368d6e7b89636743c89a61776e42ed890597 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -2956,6 +2956,9 @@ Your brand design is ''$brandDesign.'' <<switch _currentRule.setAssignment>> <<case "no default setting">> <<run delete _currentRule.setAssignment>> + + <<case "rest">> + /% slaves always qualify for this assignment %/ <<case "live with your Head Girl">> <<if ($HGSuiteSlaves < 1 && $args[0].indentureRestrictions <= 0)>>