From e22a2b6d628f14d35f1d7e4c42f0b7baf538d7eb Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Wed, 12 Aug 2020 16:46:58 -0400
Subject: [PATCH] make some kebabs
---
src/Mods/SpecialForce/TrickShotNight.tw | 12 ++++++------
src/cheats/mod_EditChildCheatNew.tw | 2 +-
src/cheats/mod_EditInfantCheatNew.tw | 2 +-
src/cheats/mod_editSlaveCheatNew.tw | 2 +-
src/pregmod/FCTV/FCTVshows.js | 6 +++---
src/uncategorized/arcadeReport.tw | 4 ++--
src/uncategorized/bodyModification.js | 2 +-
src/uncategorized/bodyModification.tw | 2 +-
src/uncategorized/brothelReport.tw | 4 ++--
src/uncategorized/clubReport.tw | 4 ++--
src/uncategorized/dairyReport.tw | 4 ++--
src/uncategorized/reAWOL.tw | 26 ++++++++++++-------------
src/uncategorized/rePokerNight.tw | 12 ++++++------
13 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/Mods/SpecialForce/TrickShotNight.tw b/src/Mods/SpecialForce/TrickShotNight.tw
index fe97bfcc3b3..ba543a6817c 100644
--- a/src/Mods/SpecialForce/TrickShotNight.tw
+++ b/src/Mods/SpecialForce/TrickShotNight.tw
@@ -48,10 +48,10 @@ Despite your direct elevator, interaction with the majority of your security for
<<replace "#result">>
You instruct $assistant.name to inform $SF.Lower that you will be attending their trick shot night, and after settling your affairs in the penthouse you head down to the firebase. The atmosphere in the firebase is casual, especially in comparison to the usual situations you meet them, though your security force still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $SF.Lower officers and turn your @@.yellowgreen;<<print cashFormat(50000)>>@@ into bullets. All that remains is to decide your strategy for the night.
<br><br>
- <span id="bountyResult">
+ <span id="bounty-result">
<<link "Play it safe">>
- <<replace "#bountyResult">>
+ <<replace "#bounty-result">>
<<if random(1,100) > _shootChance>>
Despite your attempts to mitigate risk and play the safest shots possible, it seems lady luck has conspired against you this evening. However, even when your last bullet is shot, your security force pitch you a few bullets to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've @@.green;made some friends.@@
<<run repX(5000, "event")>>
@@ -66,7 +66,7 @@ Despite your direct elevator, interaction with the majority of your security for
<<if random(1,100) < _shootChance>>
<br> <<link "Up the ante">>
- <<replace "#bountyResult">>
+ <<replace "#bounty-result">>
<<set $activeSlaveOneTimeMinAge = 25>>
<<set $activeSlaveOneTimeMaxAge = 35>>
<<set $one_time_age_overrides_pedo_mode = 1>>
@@ -117,11 +117,11 @@ Despite your direct elevator, interaction with the majority of your security for
</span>
Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of $his fair share of battles on the battlefield and at the firing range. $He's short on bullets, however, and $he'll have to buy in with something else as collateral.
<br><br>
- <span id="aliveResult">
+ <span id="alive-result">
<<link "A year of servitude">>
<<set $activeSlave.clothes = "no clothing">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
<<if random(1,100) > _shootChance>>
For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other security force clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
<<run repX(5000, "event")>>
@@ -149,7 +149,7 @@ Despite your direct elevator, interaction with the majority of your security for
<</link>>
<br> <<link "Dock $his wages">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
<<if random(1,100) > _shootChance>>
For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other security force members clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
<<run repX(5000, "event")>>
diff --git a/src/cheats/mod_EditChildCheatNew.tw b/src/cheats/mod_EditChildCheatNew.tw
index e0878612234..38557e8e755 100644
--- a/src/cheats/mod_EditChildCheatNew.tw
+++ b/src/cheats/mod_EditChildCheatNew.tw
@@ -2757,7 +2757,7 @@
<<widget BrandTab>>
''Branding:''
- <p id="brandSelection"></p>
+ <p id="brand-selection"></p>
<script>
App.Medicine.Modification.Select.brand(V.tempSlave, true)
</script>
diff --git a/src/cheats/mod_EditInfantCheatNew.tw b/src/cheats/mod_EditInfantCheatNew.tw
index 7010d35de06..a2974b8dfe7 100644
--- a/src/cheats/mod_EditInfantCheatNew.tw
+++ b/src/cheats/mod_EditInfantCheatNew.tw
@@ -2759,7 +2759,7 @@
<<widget BrandTab>>
''Branding:''
- <p id="brandSelection"></p>
+ <p id="brand-selection"></p>
<script>
App.Medicine.Modification.Select.brand(V.tempSlave, true)
</script>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 4f5dfe79c94..f13f2a7490c 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -4270,7 +4270,7 @@
<<widget BrandTab>>
''Branding:''
- <p id="brandSelection"></p>
+ <p id="brand-selection"></p>
<script>
App.Medicine.Modification.Select.brand(V.tempSlave, true)
</script>
diff --git a/src/pregmod/FCTV/FCTVshows.js b/src/pregmod/FCTV/FCTVshows.js
index 1599125bec8..3cd8b7e80a6 100644
--- a/src/pregmod/FCTV/FCTVshows.js
+++ b/src/pregmod/FCTV/FCTVshows.js
@@ -183,7 +183,7 @@ App.Data.FCTV.actors = {
slave.intelligence = jsRandom(-15, 80);
slave.intelligenceImplant = 15;
if (V.seeHyperPreg === 0) {
- slave.pregType = jsEither(6, 7, 7, 8);
+ slave.pregType = either(6, 7, 7, 8);
} else {
slave.pregType = jsRandom(10, 16);
}
@@ -299,7 +299,7 @@ App.Data.FCTV.actors = {
slave.behavioralFlaw = either("arrogant", "bitchy", "hates men");
slave.energy = 10;
slave.fetish = "none";
- slave.clit = jsEither(3, 3, 4, 4, 5, 8, 10);
+ slave.clit = either(3, 3, 4, 4, 5, 8, 10);
slave.muscles = jsRandom(0, 25);
slave.devotion = jsRandom(-25, 25);
slave.trust = jsRandom(-25, 25);
@@ -338,7 +338,7 @@ App.Data.FCTV.actors = {
slave.preg = 0;
slave.dick = jsRandom(3, 5);
slave.balls = jsRandom(3, 6);
- slave.muscles = jsEither(20, 50);
+ slave.muscles = either(20, 50);
slave.energy = jsRandom(70, 100);
slave.attrXY = jsRandom(70, 100);
slave.attrXX = jsRandom(70, 100);
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index da0422f75af..8bc8eac2c9a 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -1,6 +1,6 @@
:: Arcade Report [nobr]
-<span id="arcadeStats">
+<span id="arcade-stats">
</span>
<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.arcade)>>
@@ -292,7 +292,7 @@
<!-- Statistics output -->
<<includeDOM App.Facilities.Arcade.Stats(false)>>
<<timed 50ms>>
- <<replace #arcadeStats>>
+ <<replace #arcade-stats>>
<<includeDOM App.Facilities.Arcade.Stats(true)>>
<</replace>>
<</timed>>
diff --git a/src/uncategorized/bodyModification.js b/src/uncategorized/bodyModification.js
index 3a00623f38b..08e7c5fed70 100644
--- a/src/uncategorized/bodyModification.js
+++ b/src/uncategorized/bodyModification.js
@@ -228,7 +228,7 @@ App.Medicine.Modification.Select.brand = function(slave, cheat = false) {
}
}
el.append(p);
- return jQuery('#brandSelection').empty().append(el);
+ return jQuery('#brand-selection').empty().append(el);
function symbolBlock(brandList) {
const div = document.createElement('div');
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 244162c389f..4635f087622 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -649,7 +649,7 @@
/* Branding */
<h2>Branding</h2>
-<span id="brandSelection"></span>
+<span id="brand-selection"></span>
<script>
App.Medicine.Modification.Select.brand(getSlave(V.AS))
</script>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index b0fc1303f6a..6caa232123e 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -1,6 +1,6 @@
:: Brothel Report [nobr]
-<span id="brothelStats">
+<span id="brothel-stats">
</span>
<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.brothel)>>
@@ -345,7 +345,7 @@
<!-- Statistics output -->
<<includeDOM App.Facilities.Brothel.Stats(false)>>
<<timed 50ms>>
- <<replace #brothelStats>>
+ <<replace #brothel-stats>>
<<includeDOM App.Facilities.Brothel.Stats(true)>>
<</replace>>
<</timed>>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 012ce2c6b50..8e70c1dfb32 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -1,6 +1,6 @@
:: Club Report [nobr]
-<span id="clubStats"></span>
+<span id="club-stats"></span>
<<set _slaves = App.Utils.sortedEmployees(App.Entity.facilities.club)>>
<<set _DL = _slaves.length, _SL = $slaves.length, $clubBonuses = 0, $legendaryEntertainerID = 0, _FLsFetish = 0>>
@@ -246,7 +246,7 @@
<!-- Statistics output -->
<<includeDOM App.Facilities.Club.Stats(false)>>
<<timed 50ms>>
- <<replace #clubStats>>
+ <<replace #club-stats>>
<<includeDOM App.Facilities.Club.Stats(true)>>
<</replace>>
<</timed>>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 745f7775b2b..d8e3db36fe1 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -1,6 +1,6 @@
:: Dairy Report [nobr]
-<span id="dairyStats">
+<span id="dairy-stats">
</span>
<<set _MMWorkout = 0>>
@@ -1195,7 +1195,7 @@ $dairyNameCaps produced <<print _milkWeek+_outputMilk>> liters of milk<<if _cumW
<!-- Statistics output -->
<<includeDOM App.Facilities.Dairy.Stats(false)>>
<<timed 50ms>>
- <<replace #dairyStats>>
+ <<replace #dairy-stats>>
<<includeDOM App.Facilities.Dairy.Stats(true)>>
<</replace>>
<</timed>>
diff --git a/src/uncategorized/reAWOL.tw b/src/uncategorized/reAWOL.tw
index bd60363f81a..d1d4c814dc3 100644
--- a/src/uncategorized/reAWOL.tw
+++ b/src/uncategorized/reAWOL.tw
@@ -156,10 +156,10 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<</replace>>
It doesn't take long for a squad of $SF.Lower to track $him down. Soon you have the troublesome turncoat before you in chains.
<br><br>
- <span id="aliveResult">
+ <span id="alive-result">
<<link "Enslave $him">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
Despite the trouble $he has caused you, you manage to complete the legalities and biometric scanning quickly and without incident. Of course, this is in large part due to the fact that the would-be mutineer is of course restrained. Based on the accounts of $his captors and the numerous injuries evident amongst them, $he is likely to be violent when $he is finally released.
<br>
<<include "New Slave Intro">>
@@ -169,7 +169,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<br>
<<link "Flog $him in public then exile $him from the arcology">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
An example must be made. There is a binding contract between you and your $mercenariesTitle, and this $woman attempted to undermine it for $his own selfish profit. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@ In addition @@.green;Arcology prosperity improves,@@ a result of showing your citizens that you are willing and able to deal with such matters in-house.
<<set $arcologies[0].prosperity += 2>>
<<run repX(5000, "event", $activeSlave)>>
@@ -179,7 +179,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<</replace>>
<</link>>
- </span> /* closes aliveResult */
+ </span> /* closes alive-result */
<</replace>> /* SFresult */
<</link>> /* want $him alive */
@@ -197,7 +197,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<<replace "#result">>
You take a tablet and draft a bounty notice for the mutinous mercenary. When you have the majority of the pertinent details committed to text, all that remains is to decide the fate of your quarry.
<br><br>
- <span id="bountyResult">
+ <span id="bounty-result">
<<link "You want $him dead">>
<<replace "#artFrame">>
@@ -209,7 +209,7 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<</if>>
/* 000-250-006 */
<</replace>>
- <<replace "#bountyResult">>
+ <<replace "#bounty-result">>
Despite the trouble $he has caused you, the culmination of this mercenary's wanton flight from the rest of the $mercenariesTitle is decidedly an anti-climax. The last you hear of $him is in the footnote of one of your daily reports, with some minute yet suitably gory pictures as an accompaniment. When the stolen weapons are returned to their rightful place in your arcology, the unfortunate matter is concluded once and for all. @@.green;Your reputation improves,@@ a result of the fear of crossing you that your unpleasantness has inspired.
<<run repX(5000, "event", $activeSlave)>>
<<run cashX(-5000, "capEx")>>
@@ -234,13 +234,13 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<</if>>
/* 000-250-006 */
<</replace>>
- <<replace "#bountyResult">>
+ <<replace "#bounty-result">>
It doesn't take long for some hired guns, motivated by the bounty, to track $him down. Soon you have the troublesome turncoat before you in chains.
<br><br>
- <span id="aliveResult">
+ <span id="alive-result">
<<link "Enslave $him">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
Despite the trouble $he has caused you, you manage to complete the legalities and biometric scanning quickly and without incident. Of course, this is in large part due to the fact that the would-be mutineer is of course restrained. Based on the accounts of $his captors and the numerous injuries evident amongst them, $he is likely to be violent when $he is finally released.
<br>
<<include "New Slave Intro">>
@@ -251,18 +251,18 @@ Your window of opportunity to act is closing. If you have plans for punishing th
<br>
<<link "Flog $him in public then exile $him from the arcology">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
An example must be made. There is a binding contract between you and your $mercenariesTitle, and this $woman attempted to undermine it for $his own selfish profit. The protesting bitch is stripped and flogged on the promenade before being escorted bleeding from the arcology. The public @@.green;approves of this harshness.@@
<<run repX(5000, "event", $activeSlave)>>
<<run cashX(-5000, "event", $activeSlave)>>
<</replace>>
<</link>>
- </span> /* closes aliveResult */
- <</replace>> /* bountyResult */
+ </span> /* closes alive-result */
+ <</replace>> /* bounty-result */
<</link>> /* want $him alive */
- </span> /* closes bountyResult */
+ </span> /* closes bounty-result */
<</replace>> /* result */
<</link>> // It will cost <<print cashFormat(5000)>> to put out a bounty on $him.//
<</if>> /* cash >= 5000 */
diff --git a/src/uncategorized/rePokerNight.tw b/src/uncategorized/rePokerNight.tw
index 8e30381da48..122be0bc466 100644
--- a/src/uncategorized/rePokerNight.tw
+++ b/src/uncategorized/rePokerNight.tw
@@ -38,9 +38,9 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<<replace "#result">>
You instruct $assistant.name to inform your $mercenariesTitle that you will be attending their poker night, and after settling your affairs in the penthouse you head down to the barracks. Unsurprisingly the atmosphere in the barracks is casual, especially in comparison to the high stakes games commonplace in arcology high society, though your mercenaries still maintain some measure of decorum towards you as their employer. Eventually, you settle in at the table with a handful of $mercenariesTitle officers and cash in your <<print cashFormat(5000)>> into chips. All that remains is to decide your strategy for the night.
<br><br>
- <span id="bountyResult">
+ <span id="bounty-result">
<<link "Play it safe">>
- <<replace "#bountyResult">>
+ <<replace "#bounty-result">>
<<if random(1,100) > 50>>
Despite your attempts to mitigate risk and play the safest hands possible, it seems lady luck has conspired against you this evening. However, even when your last chip is spent, your mercenaries pitch you a few chips to keep you in the game for the rest of the night. You may have lost most of your ¤, but it seems you've @@.green;made some friends.@@
<<run repX(5000, "event")>>
@@ -103,13 +103,13 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<</if>>
/* 000-250-006 */
<</replace>>
- <<replace "#bountyResult">>
+ <<replace "#bounty-result">>
Some aggressive play and an eye for riling up your fellow players has resulted in an immense payout, and all but one of your adversaries have folded as the situation has escalated. The only player still in contention is a wily old mercenary, the veteran of $his fair share of battles on the battlefield and at the poker table. $He's short on chips, however, and $he'll have to buy in with something else as collateral.
<br><br>
- <span id="aliveResult">
+ <span id="alive-result">
<<set $activeSlave.clothes = "no clothing">>
<<link "A year of servitude">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
<<if random(1,100) > 50>>
For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
<<run repX(5000, "event")>>
@@ -134,7 +134,7 @@ On a particularly lackadaisical evening, you find yourself alerted to a message
<</link>>
<br>
<<link "Dock $his wages">>
- <<replace "#aliveResult">>
+ <<replace "#alive-result">>
<<if random(1,100) > 50>>
For all your skillful maneuvering to reach this position, ultimately the win comes down to chance. This time, however, luck was not on your side. As the victor sweeps up $his spoils, the other mercenaries clap you on the back and offer their condolences for your defeat. Though you may have lost your ¤, it seems you've @@.green;made some friends.@@
<<run repX(5000, "event")>>
--
GitLab