From 9ee3e6440a0f720c80c94e604959bb44127de2f7 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sun, 21 Oct 2018 20:19:51 -0400
Subject: [PATCH] Fixes
---
devNotes/twine JS.txt | 1 +
src/js/assayJS.tw | 1 +
src/uncategorized/BackwardsCompatibility.tw | 28 ++++++
src/uncategorized/manageArcology.tw | 96 +++++++++++----------
4 files changed, 80 insertions(+), 46 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index e00e1810b3a..acbf3f21846 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 011db808b35..069743d710f 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 a4685e2b537..bb7011bd855 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 efa20e9d35b..43d51cf39d3 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>>
--
GitLab