diff --git a/src/SecExp/attackOptions.tw b/src/SecExp/attackOptions.tw index dccd671610c4bcee416a5444b4a8de23a56bac39..fd37c7c386503e4603a7ab335c5253d10ad52456 100644 --- a/src/SecExp/attackOptions.tw +++ b/src/SecExp/attackOptions.tw @@ -564,7 +564,7 @@ Defensive tactics <<set $chosenTactic = "Pincer Maneuver">> <<replace "#tactic">><strong><<print $chosenTactic>></strong><</replace>> <</link>> -<br> //Involves letting the enemy push back the centre in order to envelop their formation.// +<br> //Involves letting the enemy push back the center in order to envelop their formation.// <br> <<link "Defense In Depth">> <<set $chosenTactic = "Defense In Depth">> diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 32595fd62bb6f12d9522aac44089e30f5f601d56..6f22aefa935d3e68a1967638ab3613d47755990b 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -1230,7 +1230,7 @@ <<elseif $chosenTactic == "Interior Lines">> chose to employ "interior lines" tactics or exploiting the defender's shorter front to quickly disengage and concentrate troops when and where needed. <<elseif $chosenTactic == "Pincer Maneuver">> - chose to employ "pincer maneuver" tactics or attempting to encircle the enemy by faking a collapsing centre front. + chose to employ "pincer maneuver" tactics or attempting to encircle the enemy by faking a collapsing center front. <<elseif $chosenTactic == "Defense In Depth">> chose to employ "defense in depth" tactics or relying on mobility to disengage and exploit overextended enemy troops by attacking their freshly exposed flanks. <<elseif $chosenTactic == "Blitzkrieg">> diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw index 2ba2778e235351ae57d6cad511642e10c49a5e0a..73db0a7026db2b8f0a25859824d033573a0c59db 100644 --- a/src/SecExp/rebellionReport.tw +++ b/src/SecExp/rebellionReport.tw @@ -454,7 +454,7 @@ <<set _woundChance += random(1,5)>> <</if>> <<if random(1,100) <= _woundChance>> - A lucky shot managed to find your way to you, leaving a painful, but thankfully not lethal, wound. + A lucky shot managed to find its way to you, leaving a painful, but thankfully not lethal, wound. <<set $PCWounded = 1>> <<set $PCWoundCooldown = 3>> <<else>> @@ -624,7 +624,7 @@ <</if>> <<set _woundChance *= random(1,2)>> <<if random(1,100) <= _woundChance>> - A lucky shot managed to find your way to you, leaving a painful, but thankfully nonlethal, wound. + A lucky shot managed to find its way to you, leaving a painful, but thankfully nonlethal, wound. <<set $PCWounded = 1>> <<set $PCWoundCooldown = 3>> <<else>> @@ -732,7 +732,7 @@ <</if>> <<set _woundChance *= random(1,2)>> <<if random(1,100) <= _woundChance>> - A lucky shot managed to find your way to you, leaving a painful, but thankfully nonlethal, wound. + A lucky shot managed to find its way to you, leaving a painful, but thankfully nonlethal, wound. <<set $PCWounded = 1>> <<set $PCWoundCooldown = 3>> <<else>> diff --git a/src/pregmod/huskSlaveSwap.tw b/src/pregmod/huskSlaveSwap.tw index 88cbd71af17e361d5a13f645aecc929a13f2c2bf..9118ffa590d13e23a31ed2ebdab86de6655dfd21 100644 --- a/src/pregmod/huskSlaveSwap.tw +++ b/src/pregmod/huskSlaveSwap.tw @@ -10,7 +10,7 @@ You strap $slaves[_m].slaveName, and the body to which $pronoun will be transfer <<set $genePool[_gps].race = $slaves[_m].race, $genePool[_gps].skin = $slaves[_m].skin, $genePool[_gps].markings = $slaves[_m].markings, $genePool[_gps].origEye = $slaves[_m].origEye, $genePool[_gps].origHColor = $slaves[_m].origHColor, $genePool[_gps].origSkin = $slaves[_m].skin, $genePool[_gps].face = $slaves[_m].face, $genePool[_gps].pubicHStyle = $slaves[_m].pubicHStyle, $genePool[_gps].underArmHStyle = $slaves[_m].underArmHStyle>> /* special exception to swap genePool since the temporary body lacks an entry. Otherwise we could just call the widget using the genePool entries */ <br><br> -After an honestly impressive procedure, +After an honestly impressive procedure, $slaves[_m].slaveName is recovering nicely. <<BodySwapReaction $slaves[_m] _oldSlave>> @@ -29,7 +29,7 @@ $slaves[_m].slaveName's body was bought by the Flesh Heap for <<print cashFormat $slaves[_myBody].slaveName is @@.medimorchid;disturbed@@ to find her body is gone for good, damaging her @@.gold;ability to trust you.@@ <<set $slaves[_myBody].devotion -= 10, $slaves[_myBody].trust -= 5>> <<else>> - $slaves[_myBody].slaveName is @@.medimorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.mediumaquamarine;completely rejecting your ownership of her.@@ + $slaves[_myBody].slaveName is @@.medimorchid;deeply upset@@ that she'll never see her body again. With so little left, she finds it easy to take vengeance by @@.orangered;completely rejecting your ownership of her.@@ <<set $slaves[_myBody].devotion -= 50, $slaves[_myBody].trust += 200>> <</if>> <</if>> diff --git a/src/pregmod/huskSlaveSwapWorkaround.tw b/src/pregmod/huskSlaveSwapWorkaround.tw index f273dde92a52ae4a1a7061a96f38d3f06cf47ba5..362fd349b180fe154ff5ed579bd5523586cccfd4 100644 --- a/src/pregmod/huskSlaveSwapWorkaround.tw +++ b/src/pregmod/huskSlaveSwapWorkaround.tw @@ -2,11 +2,9 @@ <<set $nextButton = "Abort Operation", $nextLink = "Scheduled Event", $returnTo = "Scheduled Event">> -<<set $swapFailure = random(1,1000)>> - "This operation is neither simple nor is it perfected. There are extreme health risks involved and no guarantee of success. Strap a slave into your remote surgery to consent to the operation. Indentured servants<<if $incubator > 0>> and slaves with reserved children<</if>> not eligible." <br> -//Select the slave whose brain will be transferred into the waiting husk.<<if $cyberMod == 1>> Amputated slaves must not be wearing prosthetics.<</if>>// +//Select the slave whose mind will be transferred into the waiting husk.<<if $cyberMod == 1>> Amputated slaves must not be wearing prosthetics.<</if>>// <br><br> __Select an eligible slave:__ @@ -18,7 +16,7 @@ __Select an eligible slave:__ <<if ($slaves[_i].breedingMark == 0)>> <<if ($slaves[_i].reservedChildren == 0)>> <<if ($slaves[_i].ID != $activeSlave.ID)>> - <br><<print "[[$slaves[_i].slaveName|Husk Slave Swap][$swappingSlave = $slaves[" + _i + "]]]">> + <br><<print "[[$slaves[_i].slaveName|Husk Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= $surgeryCost]]">> <</if>> <</if>> <</if>> diff --git a/src/pregmod/pBodyswapReveal.tw b/src/pregmod/pBodyswapReveal.tw index ad5f9dd1f0a23bfda10631c04eb5ce126073c1ef..ce97c4d737f02a67ee665dc40b3939b46ba28403 100644 --- a/src/pregmod/pBodyswapReveal.tw +++ b/src/pregmod/pBodyswapReveal.tw @@ -4,6 +4,6 @@ <<set $bodyswapAnnounced = 1>> -You receive countless messages throughout the day; mostly worthless spam, several uninteresting business offers and the occasional enslavement request. This one catches your eye however. It's an offer from a top surgeon who has recently been experimenting with radical new surgeries. You've been loosely following their work for the last few weeks, ever since they successfully transferred the brain from one slave to another with minimal side effects, and it seems they are now offering their work to anyone with a surgical suite capable of performing the surgery and willing to undertake the risk. +You receive countless messages throughout the day; mostly worthless spam, several uninteresting business offers and the occasional enslavement request. This one catches your eye however. It's an offer from a top surgeon who has recently been experimenting with radical new surgeries. You've been loosely following their work for the last few weeks, ever since they successfully swapped the consciousness from one slave to another with minimal side effects, assuming they are kept on a special suppressant, and it seems they are now offering their work to anyone with a surgical suite capable of performing the surgery and willing to undertake the risk. <br><br> -It's an interesting offer and your remote surgery will suffice should you want to change up your slaves' bodies more than any drug or implant ever could. You'll need a slave to place their brain into, however. Perhaps one the mindless slaves from the Flesh Heap will suit your needs. +It's an interesting offer and your remote surgery will suffice should you want to change up your slaves' bodies more than any drug or implant ever could. You'll need a slave to swap them with, however. Perhaps one the mindless slaves from the Flesh Heap will suit your needs, should you not wish to use your own stock diff --git a/src/pregmod/slaveSlaveSwap.tw b/src/pregmod/slaveSlaveSwap.tw index 5599c26827a7a97690c165a6a421f52d3d407e26..1233b98f4468d27ef3d845088e9840b3087d8795 100644 --- a/src/pregmod/slaveSlaveSwap.tw +++ b/src/pregmod/slaveSlaveSwap.tw @@ -17,13 +17,13 @@ You strap $activeSlave.slaveName and $swappingSlave.slaveName into the remote su <<BodySwap $genePool[_gps2] _gps1Clone>> <br><br> -After an honestly impressive procedure, +After an honestly impressive procedure, $slaves[_ss1].slaveName is recovering nicely. <<BodySwapReaction $slaves[_ss1] _ss2Clone>> <br><br> -In the neighboring bed, +In the neighboring bed, $slaves[_ss2].slaveName rests peacefully. <<BodySwapReaction $slaves[_ss2] _ss1Clone>> diff --git a/src/pregmod/slaveSlaveSwapWorkaround.tw b/src/pregmod/slaveSlaveSwapWorkaround.tw index 10e67eacfc970f9831eb3ef6641b21bdb0c03483..a85a91cf4a0da96be296598dd8f536ed292a0502 100644 --- a/src/pregmod/slaveSlaveSwapWorkaround.tw +++ b/src/pregmod/slaveSlaveSwapWorkaround.tw @@ -12,7 +12,7 @@ __Select an eligible slave:__ <<if isSlaveAvailable($slaves[_i])>> <<if $slaves[_i].fuckdoll == 0>> <<if ($slaves[_i].ID != $activeSlave.ID)>> - <br><<print "[[$slaves[_i].slaveName|Slave Slave Swap][$swappingSlave = $slaves[" + _i + "]]]">> + <br><<print "[[$slaves[_i].slaveName|Slave Slave Swap][$swappingSlave = $slaves[" + _i + "], $cash -= $surgeryCost]]">> <</if>> <</if>> <</if>> diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw index 9c4b5afe9a8263c20a0e6c3846656e8f0b27a382..48fae684dfab1185dc1c76daf3d1b8c48fa02f53 100644 --- a/src/pregmod/widgets/bodySwapReaction.tw +++ b/src/pregmod/widgets/bodySwapReaction.tw @@ -16,7 +16,6 @@ <<set _end = 0>> -$args[0].slaveName is recovering nicely. <<if $args[0].health >= $args[1].health+10>> The monitors indicate that her @@.green;health has improved@@ from her previous body. Whatever else happens, she will likely appreciate this. <<elseif $args[0].health <= $args[1].health-10>> diff --git a/src/uncategorized/arcologyDescription.tw b/src/uncategorized/arcologyDescription.tw index 5fb5f03bc1a3c8451a697e9e04e4c14ff2bb7663..952cc8e10164af58e204f870623dee7f33c5f0f5 100644 --- a/src/uncategorized/arcologyDescription.tw +++ b/src/uncategorized/arcologyDescription.tw @@ -381,7 +381,7 @@ Its<<if $weatherCladding == 2>> glorious<<elseif $weatherCladding > 0>> dull<<el Down in the lower levels of the arcology the weapons manufacturing facility dominates the environment; there, armaments of all kind are produced and shipped away. <</if>> <<if $riotCenter == 1>> - Near the penthouse the riot control centre can be found. Here dissidents and dangerous political forces of $arcologies[0].name are carefully monitored and managed. + Near the penthouse the riot control center can be found. Here dissidents and dangerous political forces of $arcologies[0].name are carefully monitored and managed. <</if>> <<if $transportHub == 1>> The transport hub, in the commercial section of the arcology, deals with new arrivals to $arcologies[0].name via <<if $terrain != "oceanic" && $terrain != "marine">>land<<else>>sea<</if>> in addition to air. diff --git a/src/uncategorized/securityForceEOWReport.tw b/src/uncategorized/securityForceEOWReport.tw index 69c06e02307a9e6d5e4c34c7b23d8b12d6e88af0..6bf53e148baa31b0c7c963f145d5c7238a6313f3 100644 --- a/src/uncategorized/securityForceEOWReport.tw +++ b/src/uncategorized/securityForceEOWReport.tw @@ -234,7 +234,7 @@ <<set _RaidingEfficiency = .1>> /* Raiding Efficiency Modifier Calculations - /* Drugs make them better at everything, but especially much better at raiding - much easier to murder and pillage when you're fucked out of your mind on a mix of meth, pcp, and lsd. Having an effective; CIC (Combat Information Centre) at the barracks, air force, Satellite, AC-130, major and more efficient facility support massively improves raiding efficiency. If we are dealing with an oceanic arcology the sub and carrier massively improve efficiency. */ + /* Drugs make them better at everything, but especially much better at raiding - much easier to murder and pillage when you're fucked out of your mind on a mix of meth, pcp, and lsd. Having an effective; CIC (Combat Information Center) at the barracks, air force, Satellite, AC-130, major and more efficient facility support massively improves raiding efficiency. If we are dealing with an oceanic arcology the sub and carrier massively improve efficiency. */ /* Facilities */