diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index e00e1810b3a427ef31d5f4dab301dc496495ac96..acbf3f21846bda91804eb564e999210c536f44bc 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -8959,6 +8959,7 @@ window.DegradingName = function DegradingName(slave) { if (typeof surname === "string" && surname.toLowerCase() === slave.slaveName.toLowerCase()) { DegradingName(slave); } + slave.slaveName = capFirstChar(slave.slaveName); slave.slaveSurname = surname; }; diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index 011db808b35f82f666e6aa1dc98d76ec3c57704f..069743d710ff7b96348c18da1ebd7c5c760f0ac3 100644 --- a/src/js/assayJS.tw +++ b/src/js/assayJS.tw @@ -1873,6 +1873,7 @@ window.DegradingName = function DegradingName(slave) { if (typeof surname === "string" && surname.toLowerCase() === slave.slaveName.toLowerCase()) { DegradingName(slave); } + slave.slaveName = capFirstChar(slave.slaveName); slave.slaveSurname = surname; }; diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index a4685e2b5376e4c34f752e6c111835a39cf931d9..bb7011bd855bc42e8af6868eaa4180d64abfe31c 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -988,6 +988,34 @@ <<set $prisonCircuit = ["low tier criminals", "gangs and smugglers", "white collar", "military prison"]>> <<set $prisonCircuitIndex = random(0,$prisonCircuit.length-1)>> <</if>> +<<if $captureUpgradeRace === "">> + <<set $generalUpgradeBreaking = "unselected">> + <<set $generalUpgradeWeight = "unselected">> + <<set $generalUpgradeMuscle = "unselected">> + <<set $entrapmentUpgradeDevotionOne = "unselected">> + <<set $entrapmentUpgradeDevotionTwo = "unselected">> + <<set $entrapmentUpgradeIntelligence = "unselected">> + <<set $captureUpgradeGender = "unselected">> + <<set $surgicalUpgradeGenitalia = "unselected">> + <<set $captureUpgradeAge = "unselected">> + <<set $captureUpgradeRace = "unselected">> + <<set $trainingUpgradeAccent = "unselected">> + <<set $trainingUpgradeEducation = "unselected">> + <<set $trainingUpgradeSexEd = "unselected">> + <<set $surgicalUpgradeCosmetics = "unselected">> + <<set $surgicalUpgradeImplants = "unselected">> + <<set $drugUpgradeHormones = "unselected">> + <<set $drugUpgradeInjectionOne = "unselected">> + <<set $drugUpgradeInjectionTwo = "unselected">> +<</if>> +<<if $slaveAssetPrice === 0>> + <<set $slaveAssetPrice = 10>> + <<set $entrapmentAssetPrice = 10>> + <<set $captureAssetPrice = 10>> + <<set $trainingAssetPrice = 10>> + <<set $surgicalAssetPrice = 10>> + <<set $drugAssetPrice = 10>> +<</if>> /*SFVAR*/ <<if ndef $SF>> diff --git a/src/uncategorized/manageArcology.tw b/src/uncategorized/manageArcology.tw index efa20e9d35bb9e5c38fad934a0e943b83c3fc48f..43d51cf39d3681d476b055a58f1ea8bf8cc5b644 100644 --- a/src/uncategorized/manageArcology.tw +++ b/src/uncategorized/manageArcology.tw @@ -142,7 +142,7 @@ __Construction__ <<set $corpIncorporated = 0>> <<set $corpPeopleEnslaved = 0>> <<set $slaveAssets = 0>> - <<set $slaveAssetPrice = 0>> + <<set $slaveAssetPrice = 10>> <<set $corpProfit = 0>> <<set $corpCash = 0>> <<set $mercenariesHelpCorp = 0>> @@ -151,34 +151,36 @@ __Construction__ <<set $oldSharePrice = 0>> <<set $personalShares = 0>> <<set $publicShares = 0>> - <<set $generalAssetPrice = 0>> + <<set $generalAssetPrice = 10>> <<set $generalAssets = 0>> <<set $entrapmentAssets = 0>> - <<set $entrapmentAssetPrice = 0>> + <<set $entrapmentAssetPrice = 10>> <<set $captureAssets = 0>> - <<set $captureAssetPrice = 0>> + <<set $captureAssetPrice = 10>> <<set $trainingAssets = 0>> - <<set $trainingAssetPrice = 0>> + <<set $trainingAssetPrice = 10>> <<set $surgicalAssets = 0>> - <<set $surgicalAssetPrice = 0>> + <<set $surgicalAssetPrice = 10>> <<set $drugAssets = 0>> - <<set $drugAssetPrice = 0>> - <<set $generalUpgradeBreaking = "">> - <<set $generalUpgradeWeight = "">> - <<set $generalUpgradeMuscle = "">> - <<set $entrapmentUpgradeDevotionOne = "", $entrapmentUpgradeDevotionTwo = "">> - <<set $entrapmentUpgradeIntelligence = "">> - <<set $captureUpgradeGender = "">> - <<set $surgicalUpgradeGenitalia = "">> - <<set $captureUpgradeAge = "">> - <<set $captureUpgradeRace = "">> - <<set $trainingUpgradeAccent = "">> - <<set $trainingUpgradeEducation = "">> - <<set $surgicalUpgradeCosmetics = "">> - <<set $surgicalUpgradeImplants = "">> - <<set $drugUpgradeHormones = "">> - <<set $drugUpgradeInjectionOne = "">> - <<set $drugUpgradeInjectionTwo = "">> + <<set $drugAssetPrice = 10>> + <<set $generalUpgradeBreaking = "unselected">> + <<set $generalUpgradeWeight = "unselected">> + <<set $generalUpgradeMuscle = "unselected">> + <<set $entrapmentUpgradeDevotionOne = "unselected">> + <<set $entrapmentUpgradeDevotionTwo = "unselected">> + <<set $entrapmentUpgradeIntelligence = "unselected">> + <<set $captureUpgradeGender = "unselected">> + <<set $surgicalUpgradeGenitalia = "unselected">> + <<set $captureUpgradeAge = "unselected">> + <<set $captureUpgradeRace = "unselected">> + <<set $trainingUpgradeAccent = "unselected">> + <<set $trainingUpgradeEducation = "unselected">> + <<set $trainingUpgradeSexEd = "unselected">> + <<set $surgicalUpgradeCosmetics = "unselected">> + <<set $surgicalUpgradeImplants = "unselected">> + <<set $drugUpgradeHormones = "unselected">> + <<set $drugUpgradeInjectionOne = "unselected">> + <<set $drugUpgradeInjectionTwo = "unselected">> <<goto "Manage Arcology">> <</link>> <<elseif $corpIncorporated == 1 && $corpMarket == 1>> @@ -186,7 +188,7 @@ __Construction__ <<set $corpIncorporated = 0>> <<set $corpPeopleEnslaved = 0>> <<set $slaveAssets = 0>> - <<set $slaveAssetPrice = 0>> + <<set $slaveAssetPrice = 10>> <<set $corpProfit = 0>> <<set $corpCash = 0>> <<set $mercenariesHelpCorp = 0>> @@ -195,34 +197,36 @@ __Construction__ <<set $oldSharePrice = 0>> <<set $personalShares = 0>> <<set $publicShares = 0>> - <<set $generalAssetPrice = 0>> + <<set $generalAssetPrice = 10>> <<set $generalAssets = 0>> <<set $entrapmentAssets = 0>> - <<set $entrapmentAssetPrice = 0>> + <<set $entrapmentAssetPrice = 10>> <<set $captureAssets = 0>> - <<set $captureAssetPrice = 0>> + <<set $captureAssetPrice = 10>> <<set $trainingAssets = 0>> - <<set $trainingAssetPrice = 0>> + <<set $trainingAssetPrice = 10>> <<set $surgicalAssets = 0>> - <<set $surgicalAssetPrice = 0>> + <<set $surgicalAssetPrice = 10>> <<set $drugAssets = 0>> - <<set $drugAssetPrice = 0>> - <<set $generalUpgradeBreaking = "">> - <<set $generalUpgradeWeight = "">> - <<set $generalUpgradeMuscle = "">> - <<set $entrapmentUpgradeDevotionOne = "", $entrapmentUpgradeDevotionTwo = "">> - <<set $entrapmentUpgradeIntelligence = "">> - <<set $captureUpgradeGender = "">> - <<set $surgicalUpgradeGenitalia = "">> - <<set $captureUpgradeAge = "">> - <<set $captureUpgradeRace = "">> - <<set $trainingUpgradeAccent = "">> - <<set $trainingUpgradeEducation = "">> - <<set $surgicalUpgradeCosmetics = "">> - <<set $surgicalUpgradeImplants = "">> - <<set $drugUpgradeHormones = "">> - <<set $drugUpgradeInjectionOne = "">> - <<set $drugUpgradeInjectionTwo = "">> + <<set $drugAssetPrice = 10>> + <<set $generalUpgradeBreaking = "unselected">> + <<set $generalUpgradeWeight = "unselected">> + <<set $generalUpgradeMuscle = "unselected">> + <<set $entrapmentUpgradeDevotionOne = "unselected">> + <<set $entrapmentUpgradeDevotionTwo = "unselected">> + <<set $entrapmentUpgradeIntelligence = "unselected">> + <<set $captureUpgradeGender = "unselected">> + <<set $surgicalUpgradeGenitalia = "unselected">> + <<set $captureUpgradeAge = "unselected">> + <<set $captureUpgradeRace = "unselected">> + <<set $trainingUpgradeAccent = "unselected">> + <<set $trainingUpgradeEducation = "unselected">> + <<set $trainingUpgradeSexEd = "unselected">> + <<set $surgicalUpgradeCosmetics = "unselected">> + <<set $surgicalUpgradeImplants = "unselected">> + <<set $drugUpgradeHormones = "unselected">> + <<set $drugUpgradeInjectionOne = "unselected">> + <<set $drugUpgradeInjectionTwo = "unselected">> <<set $corpMarket = 0>> <<for _i = 0; _i < $sectors.length; _i++>> <<if $sectors[_i].type == "CorporateMarket">><<set $sectors[_i].type = "Markets">><<break>><</if>>