From 0871429c99145e0b912977e9c6e47f0ce687389b Mon Sep 17 00:00:00 2001 From: ezsh <ezsh.junk@gmail.com> Date: Sat, 19 Jan 2019 03:58:09 +0100 Subject: [PATCH] Fix references to cashX. Closes #417. --- src/pregmod/criminalMarkets.tw | 6 +++--- src/pregmod/eliteSlave.tw | 2 +- src/pregmod/seFCTVshows.tw | 4 ++-- src/uncategorized/householdLiquidator.tw | 6 +++--- src/uncategorized/prestigiousSlave.tw | 2 +- src/uncategorized/slaveShelter.tw | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/pregmod/criminalMarkets.tw b/src/pregmod/criminalMarkets.tw index 9404a1c854a..174e56e68b8 100644 --- a/src/pregmod/criminalMarkets.tw +++ b/src/pregmod/criminalMarkets.tw @@ -52,11 +52,11 @@ You board the transport to It will cost <<print cashFormat($slaveCost)>> to enslave $him. <<if $cash >= $slaveCost>> - <br>[["Enslave " + $him + " and check out other available prisoners"|Criminal Market][$cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]] + <br>[["Enslave " + $him + " and check out other available prisoners"|Criminal Market][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $newSlaves.push($activeSlave), $introType = "multi", $slavesSeen+=1]] <<if $newSlaves.length == 0>> - <br>[["Enslave " + $him|New Slave Intro][$cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]] + <br>[["Enslave " + $him|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]] <<else>> - <br>[["Enslave " + $him + " and finish your inspection"|Bulk Slave Intro][$cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $newSlaves.push($activeSlave)]] + <br>[["Enslave " + $him + " and finish your inspection"|Bulk Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $newSlaves.push($activeSlave)]] <</if>> <<else>> //You lack the necessary funds to enslave this criminal.// diff --git a/src/pregmod/eliteSlave.tw b/src/pregmod/eliteSlave.tw index 887bfac23c3..b2101a8b67a 100644 --- a/src/pregmod/eliteSlave.tw +++ b/src/pregmod/eliteSlave.tw @@ -210,7 +210,7 @@ It will take <<print cashFormat($slaveCost)>> to win the auction. <br><br> <<if $cash >= $slaveCost>> - [[Place that bid|New Slave Intro][$cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]] + [[Place that bid|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]] <<else>> //You lack the necessary funds to place a winning bid.// <</if>> diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw index cbac6399e76..22013cb50c8 100644 --- a/src/pregmod/seFCTVshows.tw +++ b/src/pregmod/seFCTVshows.tw @@ -370,7 +370,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN The offered price is <<print cashFormat($slaveCost)>>. <<if $cash >= $slaveCost>> - <br>[[Buy her slave contract|New Slave Intro][$cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $nextLink = "Scheduled Event", $returnTo = "Scheduled Event"]] + <br>[[Buy her slave contract|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $nextLink = "Scheduled Event", $returnTo = "Scheduled Event"]] <<else>> //@@.red;You lack the necessary funds to buy this slave.@@// <</if>> @@ -1101,4 +1101,4 @@ The offered price is <<print cashFormat($slaveCost)>>. <<default>> It seems there's a technical error preventing you from streaming, you tell $assistantName to look into it. -<</switch>> \ No newline at end of file +<</switch>> diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw index 6719b40a81c..5063a03b1a7 100644 --- a/src/uncategorized/householdLiquidator.tw +++ b/src/uncategorized/householdLiquidator.tw @@ -33,7 +33,7 @@ The price is <<print cashFormat($slaveCost*3)>>. <br><br> <<if $cash >= $slaveCost*3>> - [[Buy their slave contract|Siblings Workaround][$cashX(forceNeg($slaveCost*3), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]] + [[Buy their slave contract|Siblings Workaround][cashX(forceNeg($slaveCost*3), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]] <<else>> //You lack the necessary funds to buy these slaves.// <</if>> @@ -79,7 +79,7 @@ The price is <<print cashFormat($slaveCost*3)>>.<<if $slavesSeen > $slaveMarketL <br><br> <<if $cash >= $slaveCost*3>> - [[Buy their slave contract|Mother Daughter Workaround][$cashX(forceNeg($slaveCost*3), "slaveTransaction", $activeSlave),,"Continue",$nextLink = "Main"]] + [[Buy their slave contract|Mother Daughter Workaround][cashX(forceNeg($slaveCost*3), "slaveTransaction", $activeSlave),,"Continue",$nextLink = "Main"]] <<else>> //You lack the necessary funds to buy these slaves.// <</if>> @@ -121,7 +121,7 @@ The price is <<print cashFormat($slaveCost*4)>>.<<if $slavesSeen > $slaveMarketL <br><br> <<if $cash >= $slaveCost*4>> - [[Buy their slave contract|Twins Workaround][$cashX(forceNeg($slaveCost*4), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]] + [[Buy their slave contract|Twins Workaround][cashX(forceNeg($slaveCost*4), "slaveTransaction", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]] <<else>> //You lack the necessary funds to buy these slaves.// <</if>> diff --git a/src/uncategorized/prestigiousSlave.tw b/src/uncategorized/prestigiousSlave.tw index 1cf819ae54b..a17cd71687c 100644 --- a/src/uncategorized/prestigiousSlave.tw +++ b/src/uncategorized/prestigiousSlave.tw @@ -916,7 +916,7 @@ You check to see if any especially prestigious slaves are on auction. <<if $pres <br> <<if $cash >= $slaveCost>> - [[Place that bid|New Slave Intro][$cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]] + [[Place that bid|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main"]] <<else>> //You lack the necessary funds to place a winning bid.// <</if>> diff --git a/src/uncategorized/slaveShelter.tw b/src/uncategorized/slaveShelter.tw index 8aba223f34f..369f1dc2eb0 100644 --- a/src/uncategorized/slaveShelter.tw +++ b/src/uncategorized/slaveShelter.tw @@ -387,7 +387,7 @@ The placement fee is <<print cashFormat($slaveCost)>>. <<if $cash >= $slaveCost>> <<link "Buy $his slave contract">> <<replace "#result">> - <<set $cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $shelterSlaveBought = 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main">> + <<set cashX(forceNeg($slaveCost), "slaveTransaction", $activeSlave), $shelterSlaveBought = 1, $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "Main">> <<include "New Slave Intro">> <</replace>> <</link>> -- GitLab