From 2ae4325020ec9a3d6ebd17a935248c8304cbf12f Mon Sep 17 00:00:00 2001 From: kopareigns <kopareigns@gmail.com> Date: Sun, 7 Oct 2018 14:59:28 -0400 Subject: [PATCH] Bad radiobuttons --- src/cheats/mod_EditFSCheat.tw | 44 +++++++++---------- .../mod_EditNeighborArcologyCheatWidget.tw | 44 +++++++++---------- src/cheats/mod_EditSlaveCheat.tw | 38 ++++++++-------- src/cheats/mod_editSlaveCheatNew.tw | 38 ++++++++-------- src/uncategorized/BackwardsCompatibility.tw | 30 ++++++++++++- 5 files changed, 110 insertions(+), 84 deletions(-) diff --git a/src/cheats/mod_EditFSCheat.tw b/src/cheats/mod_EditFSCheat.tw index 46c86f0776d..d37eb895bf3 100644 --- a/src/cheats/mod_EditFSCheat.tw +++ b/src/cheats/mod_EditFSCheat.tw @@ -23,17 +23,17 @@ | <<radiobutton "$arcologies[0].FSSupremacistLawME" 1>> 1 (Passed.) <br>Supremacist Race: - <<radiobutton "$arcologies[0].FSSupremacistRace" white>> White | - <<radiobutton "$arcologies[0].FSSupremacistRace" asian>> Asian | - <<radiobutton "$arcologies[0].FSSupremacistRace" latina>> Latina | - <<radiobutton "$arcologies[0].FSSupremacistRace" middle eastern>> Middle Eastern | - <<radiobutton "$arcologies[0].FSSupremacistRace" black>> Black | - <<radiobutton "$arcologies[0].FSSupremacistRace" indo-aryan>> Indo-Aryan | - <<radiobutton "$arcologies[0].FSSupremacistRace" amerindian>> Amerindian | - <<radiobutton "$arcologies[0].FSSupremacistRace" pacific islander>> Pacific Islander | - <<radiobutton "$arcologies[0].FSSupremacistRace" southern european>> Southern European | - <<radiobutton "$arcologies[0].FSSupremacistRace" semitic>> Semitic | - <<radiobutton "$arcologies[0].FSSupremacistRace" mixed race>> Mixed Race + <<radiobutton "$arcologies[0].FSSupremacistRace" "white">> White | + <<radiobutton "$arcologies[0].FSSupremacistRace" "asian">> Asian | + <<radiobutton "$arcologies[0].FSSupremacistRace" "latina">> Latina | + <<radiobutton "$arcologies[0].FSSupremacistRace" "middle eastern">> Middle Eastern | + <<radiobutton "$arcologies[0].FSSupremacistRace" "black">> Black | + <<radiobutton "$arcologies[0].FSSupremacistRace" "indo-aryan">> Indo-Aryan | + <<radiobutton "$arcologies[0].FSSupremacistRace" "amerindian">> Amerindian | + <<radiobutton "$arcologies[0].FSSupremacistRace" "pacific islander">> Pacific Islander | + <<radiobutton "$arcologies[0].FSSupremacistRace" "southern european">> Southern European | + <<radiobutton "$arcologies[0].FSSupremacistRace" "semitic">> Semitic | + <<radiobutton "$arcologies[0].FSSupremacistRace" "mixed race">> Mixed Race <br>[[Apply and reset Racial Subjugationism|MOD_Edit FS Cheat][$arcologies[0].FSSubjugationist = "unset", $arcologies[0].FSSubjugationistRace = 0, $arcologies[0].FSSubjugationistDecoration = 20, $arcologies[0].FSSubjugationistLawME = 0]] @@ -59,17 +59,17 @@ | <<radiobutton "$arcologies[0].FSSubjugationistLawME" 1>> 1 (Passed.) <br>Subjugationist Race: - <<radiobutton "$arcologies[0].FSSubjugationistRace" white>> White | - <<radiobutton "$arcologies[0].FSSubjugationistRace" asian>> Asian | - <<radiobutton "$arcologies[0].FSSubjugationistRace" latina>> Latina | - <<radiobutton "$arcologies[0].FSSubjugationistRace" middle eastern>> Middle Eastern | - <<radiobutton "$arcologies[0].FSSubjugationistRace" black>> Black | - <<radiobutton "$arcologies[0].FSSubjugationistRace" indo-aryan>> Indo-Aryan | - <<radiobutton "$arcologies[0].FSSubjugationistRace" amerindian>> Amerindian | - <<radiobutton "$arcologies[0].FSSubjugationistRace" pacific islander>> Pacific Islander | - <<radiobutton "$arcologies[0].FSSubjugationistRace" southern european>> Southern European | - <<radiobutton "$arcologies[0].FSSubjugationistRace" semitic>> Semitic | - <<radiobutton "$arcologies[0].FSSubjugationistRace" mixed race>> Mixed Race + <<radiobutton "$arcologies[0].FSSubjugationistRace" "white">> White | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "asian">> Asian | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "latina">> Latina | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "middle eastern">> Middle Eastern | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "black">> Black | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "indo-aryan">> Indo-Aryan | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "amerindian">> Amerindian | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "pacific islander">> Pacific Islander | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "southern european">> Southern European | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "semitic">> Semitic | + <<radiobutton "$arcologies[0].FSSubjugationistRace" "mixed race">> Mixed Race <br>[[Apply and reset Racial Supremacy|MOD_Edit FS Cheat][$arcologies[0].FSSupremacist = "unset",$arcologies[0].FSSupremacistRace = 0, $arcologies[0].FSSupremacistDecoration = 20, $arcologies[0].FSSupremacistLawME = 0]] diff --git a/src/cheats/mod_EditNeighborArcologyCheatWidget.tw b/src/cheats/mod_EditNeighborArcologyCheatWidget.tw index 99339244154..2143602b253 100644 --- a/src/cheats/mod_EditNeighborArcologyCheatWidget.tw +++ b/src/cheats/mod_EditNeighborArcologyCheatWidget.tw @@ -68,17 +68,17 @@ <br> '' $arcologies[_i].name Supremacist race:'' $arcologies[_i].FSSupremacistRace - <br><<radiobutton "$arcologies[_i].FSSupremacistRace" white>> White | - <<radiobutton "$arcologies[_i].FSSupremacistRace" asian>> Asian | - <<radiobutton "$arcologies[_i].FSSupremacistRace" latina>> Latina | - <<radiobutton "$arcologies[_i].FSSupremacistRace" middle eastern>> Middle Eastern | - <<radiobutton "$arcologies[_i].FSSupremacistRace" black>> Black | - <<radiobutton "$arcologies[_i].FSSupremacistRace" indo-aryan>> Indo-Aryan | - <<radiobutton "$arcologies[_i].FSSupremacistRace" amerindian>> Amerindian | - <<radiobutton "$arcologies[_i].FSSupremacistRace" pacific islander>> Pacific Islander | - <<radiobutton "$arcologies[_i].FSSupremacistRace" southern european>> Southern European | - <<radiobutton "$arcologies[_i].FSSupremacistRace" semitic>> Semitic | - <<radiobutton "$arcologies[_i].FSSupremacistRace" mixed race>> Mixed Race + <br><<radiobutton "$arcologies[_i].FSSupremacistRace" "white">> White | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "asian">> Asian | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "latina">> Latina | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "middle eastern">> Middle Eastern | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "black">> Black | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "indo-aryan">> Indo-Aryan | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "amerindian">> Amerindian | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "pacific islander">> Pacific Islander | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "southern european">> Southern European | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "semitic">> Semitic | + <<radiobutton "$arcologies[_i].FSSupremacistRace" "mixed race">> Mixed Race <br> @@ -88,17 +88,17 @@ <br> '' $arcologies[_i].name Subjugationist race:'' $arcologies[_i].FSSubjugationistRace - <br><<radiobutton "$arcologies[_i].FSSubjugationistRace" white>> White | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" asian>> Asian | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" latina>> Latina | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" middle eastern>> Middle Eastern | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" black>> Black | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" indo-aryan>> Indo-Aryan | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" amerindian>> Amerindian | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" pacific islander>> Pacific Islander | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" southern european>> Southern European | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" semitic>> Semitic | - <<radiobutton "$arcologies[_i].FSSubjugationistRace" mixed race>> Mixed Race + <br><<radiobutton "$arcologies[_i].FSSubjugationistRace" "white">> White | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "asian">> Asian | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "latina">> Latina | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "middle eastern">> Middle Eastern | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "black">> Black | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "indo-aryan">> Indo-Aryan | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "amerindian">> Amerindian | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "pacific islander">> Pacific Islander | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "southern european">> Southern European | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "semitic">> Semitic | + <<radiobutton "$arcologies[_i].FSSubjugationistRace" "mixed race">> Mixed Race <br> diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index d9da6d38372..bf0d33ac8e5 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -366,12 +366,12 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>> ''Face Shape: $tempSlave.faceShape |'' <<textbox "$tempSlave.faceShape" $tempSlave.faceShape>> <br> -<<radiobutton "$tempSlave.faceShape" masculine>> Masculine -<<radiobutton "$tempSlave.faceShape" androgynous>> Androgynous -<<radiobutton "$tempSlave.faceShape" normal>> Normal -<<radiobutton "$tempSlave.faceShape" cute>> Cute -<<radiobutton "$tempSlave.faceShape" sensual>> Sensual -<<radiobutton "$tempSlave.faceShape" exotic>> Exotic +<<radiobutton "$tempSlave.faceShape" "masculine">> Masculine +<<radiobutton "$tempSlave.faceShape" "androgynous">> Androgynous +<<radiobutton "$tempSlave.faceShape" "normal">> Normal +<<radiobutton "$tempSlave.faceShape" "cute">> Cute +<<radiobutton "$tempSlave.faceShape" "sensual">> Sensual +<<radiobutton "$tempSlave.faceShape" "exotic">> Exotic <br> @@ -389,11 +389,11 @@ Custom sclera color: <<textbox "$tempSlave.sclerae" $tempSlave.sclerae>> ''Natural Skin Distinctiveness: $tempSlave.markings |'' <<textbox "$tempSlave.markings" $tempSlave.markings>> <br> -<<radiobutton "$tempSlave.markings" none>> None -<<radiobutton "$tempSlave.markings" freckles>> Freckles -<<radiobutton "$tempSlave.markings" heavily freckled>> Heavy Freckles -<<radiobutton "$tempSlave.markings" beauty mark>> Beauty Mark -<<radiobutton "$tempSlave.markings" birthmark>> Birth Mark +<<radiobutton "$tempSlave.markings" "none">> None +<<radiobutton "$tempSlave.markings" "freckles">> Freckles +<<radiobutton "$tempSlave.markings" "heavily freckled">> Heavy Freckles +<<radiobutton "$tempSlave.markings" "beauty mark">> Beauty Mark +<<radiobutton "$tempSlave.markings" "birthmark">> Birth Mark <br> @@ -484,17 +484,17 @@ Unskilled. <<textbox "$tempSlave.teeth" $tempSlave.teeth>> <br> <<if $tempSlave.physicalAge >= 12>> - <<radiobutton "$tempSlave.teeth" normal>> Normal + <<radiobutton "$tempSlave.teeth" "normal">> Normal <<elseif $tempSlave.physicalAge >= 6>> - <<radiobutton "$tempSlave.teeth" mixed>> Mixed + <<radiobutton "$tempSlave.teeth" "mixed">> Mixed <<else>> - <<radiobutton "$tempSlave.teeth" baby>> Baby + <<radiobutton "$tempSlave.teeth" "baby">> Baby <</if>> -<<radiobutton "$tempSlave.teeth" pointy>> Pointy -<<radiobutton "$tempSlave.teeth" crooked>> Crooked -<<radiobutton "$tempSlave.teeth" straightening braces>> Straightening Braces -<<radiobutton "$tempSlave.teeth" cosmetic braces>> Cosmetic Braces -<<radiobutton "$tempSlave.teeth" removable>> Removable +<<radiobutton "$tempSlave.teeth" "pointy">> Pointy +<<radiobutton "$tempSlave.teeth" "crooked">> Crooked +<<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces +<<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces +<<radiobutton "$tempSlave.teeth" "removable">> Removable <br> ''Voice (0,1,2,3): $tempSlave.voice |'' diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 4b8828269a3..174e54fa224 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -1416,12 +1416,12 @@ ''Face Shape: @@.yellow;$tempSlave.faceShape@@ '' <br> - <<radiobutton "$tempSlave.faceShape" masculine>> Masculine - <<radiobutton "$tempSlave.faceShape" androgynous>> Androgynous - <<radiobutton "$tempSlave.faceShape" normal>> Normal - <<radiobutton "$tempSlave.faceShape" cute>> Cute - <<radiobutton "$tempSlave.faceShape" sensual>> Sensual - <<radiobutton "$tempSlave.faceShape" exotic>> Exotic + <<radiobutton "$tempSlave.faceShape" "masculine">> Masculine + <<radiobutton "$tempSlave.faceShape" "androgynous">> Androgynous + <<radiobutton "$tempSlave.faceShape" "normal">> Normal + <<radiobutton "$tempSlave.faceShape" "cute">> Cute + <<radiobutton "$tempSlave.faceShape" "sensual">> Sensual + <<radiobutton "$tempSlave.faceShape" "exotic">> Exotic <br><br> ''Face Implant (0 to 100):'' @@ -1442,11 +1442,11 @@ ''Natural Skin Distinctiveness: @@.yellow;$tempSlave.markings@@ '' <br> - <<radiobutton "$tempSlave.markings" none>> None - <<radiobutton "$tempSlave.markings" freckles>> Freckles - <<radiobutton "$tempSlave.markings" heavily freckled>> Heavy Freckles - <<radiobutton "$tempSlave.markings" beauty mark>> Beauty Mark - <<radiobutton "$tempSlave.markings" birthmark>> Birth Mark + <<radiobutton "$tempSlave.markings" "none">> None + <<radiobutton "$tempSlave.markings" "freckles">> Freckles + <<radiobutton "$tempSlave.markings" "heavily freckled">> Heavy Freckles + <<radiobutton "$tempSlave.markings" "beauty mark">> Beauty Mark + <<radiobutton "$tempSlave.markings" "birthmark">> Birth Mark <br><br> ''Her hearing is :'' @@ -1920,17 +1920,17 @@ ''Teeth: @@.yellow;$tempSlave.teeth@@ '' <br> <<if $tempSlave.physicalAge >= 12>> - <<radiobutton "$tempSlave.teeth" normal>> Normal + <<radiobutton "$tempSlave.teeth" "normal">> Normal <<elseif $tempSlave.physicalAge >= 6>> - <<radiobutton "$tempSlave.teeth" mixed>> Mixed + <<radiobutton "$tempSlave.teeth" "mixed">> Mixed <<else>> - <<radiobutton "$tempSlave.teeth" baby>> Baby + <<radiobutton "$tempSlave.teeth" "baby">> Baby <</if>> - <<radiobutton "$tempSlave.teeth" pointy>> Pointy - <<radiobutton "$tempSlave.teeth" crooked>> Crooked - <<radiobutton "$tempSlave.teeth" straightening braces>> Straightening Braces - <<radiobutton "$tempSlave.teeth" cosmetic braces>> Cosmetic Braces - <<radiobutton "$tempSlave.teeth" removable>> Removable + <<radiobutton "$tempSlave.teeth" "pointy">> Pointy + <<radiobutton "$tempSlave.teeth" "crooked">> Crooked + <<radiobutton "$tempSlave.teeth" "straightening braces">> Straightening Braces + <<radiobutton "$tempSlave.teeth" "cosmetic braces">> Cosmetic Braces + <<radiobutton "$tempSlave.teeth" "removable">> Removable <br><br> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index d52fd51c7c7..16891318b0a 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -1278,13 +1278,21 @@ <<elseif ndef $arcologies[0].FSSupremacist>> <<set $arcologies[0].FSSupremacist = "unset">> <</if>> - <<if def $FSSupremacistLawME && $FSSupremacistLawME != 0>> <<set $arcologies[0].FSSupremacistLawME = $FSSupremacistLawME>> <<unset $FSSupremacistLawME>> <<elseif ndef $arcologies[0].FSSupremacistLawME>> <<set $arcologies[0].FSSupremacistLawME = 0>> <</if>> +<<if $arcologies[0].FSSupremacistRace == "middle">> + <<set $arcologies[0].FSSupremacistRace = "middle eastern">> +<<elseif $arcologies[0].FSSupremacistRace == "pacific">> + <<set $arcologies[0].FSSupremacistRace = "pacific islander">> +<<elseif $arcologies[0].FSSupremacistRace == "southern">> + <<set $arcologies[0].FSSupremacistRace = "southern european">> +<<elseif $arcologies[0].FSSupremacistRace == "mixed">> + <<set $arcologies[0].FSSupremacistRace = "mixed race">> +<</if>> <<if def $FSSubjugationist && $FSSubjugationist != "unset">> <<set $arcologies[0].FSSubjugationist = $FSSubjugationist>> @@ -1294,13 +1302,21 @@ <<elseif ndef $arcologies[0].FSSubjugationist>> <<set $arcologies[0].FSSubjugationist = "unset">> <</if>> - <<if def $FSSubjugationistLawME && $FSSubjugationistLawME != 0>> <<set $arcologies[0].FSSubjugationistLawME = $FSSubjugationistLawME>> <<unset $FSSubjugationistLawME>> <<elseif ndef $arcologies[0].FSSubjugationistLawME>> <<set $arcologies[0].FSSubjugationistLawME = 0>> <</if>> +<<if $arcologies[0].FSSubjugationistRace == "middle">> + <<set $arcologies[0].FSSubjugationistRace = "middle eastern">> +<<elseif $arcologies[0].FSSubjugationistRace == "pacific">> + <<set $arcologies[0].FSSubjugationistRace = "pacific islander">> +<<elseif $arcologies[0].FSSubjugationistRace == "southern">> + <<set $arcologies[0].FSSubjugationistRace = "southern european">> +<<elseif $arcologies[0].FSSubjugationistRace == "mixed">> + <<set $arcologies[0].FSSubjugationistRace = "mixed race">> +<</if>> <<if def $FSDegradationist && $FSDegradationist != "unset">> <<set $arcologies[0].FSDegradationist = $FSDegradationist>> @@ -2699,6 +2715,12 @@ Setting missing slave variables: <<set _Slave.faceShape = "normal">> <</if>> +<<if _Slave.markings == "heavily">> + <<set _Slave.markings = "heavily freckled">> +<<elseif _Slave.markings == "beauty">> + <<set _Slave.markings = "beauty mark">> +<</if>> + <<if ndef _Slave.customTitle>> <<set _Slave.customTitle = "">> <</if>> @@ -2757,6 +2779,10 @@ Setting missing slave variables: <<if _Slave.teeth == 0>> <<set _Slave.teeth = "normal">> +<<elseif _Slave.teeth == "straightening">> + <<set _Slave.teeth = "straightening braces">> +<<elseif _Slave.teeth == "cosmetic">> + <<set _Slave.teeth = "cosmetic braces">> <</if>> <<if ndef _Slave.boobShape>> -- GitLab