From ae4df6402db78dcc676bbbd37c36c4fd1868e6d3 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 3 Oct 2017 18:53:44 -0400 Subject: [PATCH] Fixes --- sanityCheck | 2 +- src/init/dummy.tw | 2 +- src/uncategorized/SFMBarracks.tw | 2 +- src/uncategorized/seRaiding.tw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sanityCheck b/sanityCheck index a7536dc91cc..9b0d1f01008 100755 --- a/sanityCheck +++ b/sanityCheck @@ -94,7 +94,7 @@ $GREP '<<\s*\$' -- 'src/*' | myprint "VarSignAtMacroStart" ( cd src/ cat $(find . -name "*.tw" ) | tr -c '$a-zA-Z' '\n' | sed -n '/^[$]/p' | grep -v "Nationalities" | sort | uniq -u | sed 's/^[$]/-e[$]/' | sed 's/$/\\\\W/' | xargs -r git grep -n --color | myprint "OnlyUsedOnce" -cat $(find . -name "*.tw" ! -name "*JS.tw" ) | tr -c '.$a-zA-Z[]_' '\n' | sed -n -e 's/^[$]\(PC\|activeSlave\|\(slaves\|tanks\)\[[^]]*\]*\)[.]\([a-zA-Z]*\).*$/[.]\3/p' | sort | uniq -u |sed 's/^\(.*\)$/-e\1\\\\\b/' | xargs -r git grep -n --color | myprint "SlaveAttributeUsedOnce" +#cat $(find . -name "*.tw" ) | tr -c '.$a-zA-Z[]_' '\n' | sed -n -e 's/^[$]\(PC\|activeSlave\|\(slaves\|tanks\)\[[^]]*\]*\)[.]\([a-zA-Z]*\).*$/[.]\3/p' | sort | uniq -u |sed 's/^\(.*\)$/-e\1\\\\\b/' | xargs -r git grep -n --color | myprint "SlaveAttributeUsedOnce" ) diff --git a/src/init/dummy.tw b/src/init/dummy.tw index 60aa2bf8ff2..df7a2f03e99 100644 --- a/src/init/dummy.tw +++ b/src/init/dummy.tw @@ -21,7 +21,7 @@ $belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames $ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence $hare1, $hare2, $hare3, $hareSpeed, $hareSpeed1, $hareSpeed2, $hareSpeed3, $origin1, $origin2, $origin3, $LurcherSpeed $$i -$SSSlavesIDs, $MishceviousColonel, $PsychopathicColonel, $JadedColonel, $ShellShockedColonel, $BrazenColonel +$SSSlavesIDs $activeSlave.bodySwap, $activeSlave.customImageFormat, $activeSlave.customHairVector, $activeSlave.shoeColor $drugs $PC.origRace, $PC.origSkin diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw index c37d00be20c..a24b7e90de6 100644 --- a/src/uncategorized/SFMBarracks.tw +++ b/src/uncategorized/SFMBarracks.tw @@ -346,7 +346,7 @@ <</if>> <<if $securityForceUpgradeToken == 0 && $securityForceAircraftPower >= 5 && $securityForceStimulantPower >= 5 && $securityForceArcologyUpgrades >= 5 && $securityForceVehiclePower >= 5 && $securityForceDronePower >= 5 && $securityForceInfantryPower >= 5 && $securityForceAC130 < 1>> - <<link "Ask The Colonel to 'borrow' a AC-130">> + <<link "Ask The Colonel to 'borrow' an AC-130">> <<replace "#result2">> "Sure, boss." she says, nodding. "A AC-130 would help a lot." She laughs. "The scum out there don't seem to like it when we have things that their shit equipment can't damage." She picks up a tablet and taps a few commands on it. "I'll get right on it." <<set $securityForceUpgradeToken = 1>> diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw index 3d2e5edf903..cdfd2950ddb 100644 --- a/src/uncategorized/seRaiding.tw +++ b/src/uncategorized/seRaiding.tw @@ -14,7 +14,7 @@ <<if $securityForceActive == 0>> The leader of your $mercenariesTitle has contacted you from the world outside your arcology. It seems that your $mercenariesTitle have enjoyed a profitable series of raids in their time outside the arcology and have decided to push their luck by plundering one last location on their way back to the arcology. As their nominal leader, they ask your opinion of a small number of potential targets. Given the distance from the arcology and the time sensitivity of conducting such a mission, you have little to base your decision on besides a brief description. -<<elseif $securityForceSatalitePower >= 1>>>> +<<elseif $securityForceSatalitePower >= 1>> The leader of your $mercenariesTitle has contacted you from the world outside your arcology. It seems that your $mercenariesTitle have enjoyed a profitable series of raids in their time outside the arcology and have decided to push their luck by plundering one last location on their way back to the arcology. As their nominal leader, they ask your opinion of a small number of potential targets. Given the distance from the arcology and the time sensitivity of conducting such a mission, you have little to base your decision on besides a brief description. By having access to the use of $securityForceName's satalite it is less likely that the target will escape. <</if>> -- GitLab