From 5d313d6931f39ed18247fee923cbd369c8b14290 Mon Sep 17 00:00:00 2001 From: j <okp57855@psoxs.com> Date: Fri, 5 Jan 2018 10:56:06 +1300 Subject: [PATCH] Latest code. --- src/events/intro/introSummary.tw | 174 ++++++++++--------------- src/npc/startingGirls/startingGirls.tw | 2 +- 2 files changed, 71 insertions(+), 105 deletions(-) diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 9922c68f2bd..e5b351ffb22 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -25,11 +25,6 @@ You may review your settings before clicking "Continue" to begin. <<set $PC.origHColor = $PC.hColor>> <</if>> -<<if ($economy != 1) || ($seeDicks != 50) || ($continent != "North America") || ($internationalTrade != 1) || ($internationalVariety != 1) || ($seeRace != 1) || ($seeNationality != 1) || ($seeExtreme != 0) || ($seeCircumcision != 1) || ($seeAge != 1) || ($plot != 1)>> - //[[restore defaults|Intro Summary][$seeDicks = 50,$economy = 1,$continent = "North America",$internationalTrade = 1,$internationalVariety = 1,$seeRace = 1,$seeNationality = 1,$seeExtreme = 0,$seeCircumcision = 1,$seeAge = 1,$plot = 1]]// -<</if>> -<br><br> - __''World Settings''__ <br> @@ -508,19 +503,18 @@ __''Player Character''__ , with your birthday in <<textbox "$PC.birthWeek" $PC.birthWeek "Intro Summary">> weeks <<if $playerAging == 2>> - and will ''age naturally'' + and will ''age naturally''. [[Disable aging|Intro Summary][$playerAging = 0]] | [[Semi aging|Intro Summary][$playerAging = 1]] <<elseif $playerAging == 1>> - and ''will'' celebrate birthdays, but ''not age'' + and ''will'' celebrate birthdays, but ''not age''. [[Enable aging fully|Intro Summary][$playerAging = 2]] | [[Disable aging|Intro Summary][$playerAging = 0]] <<else>> - and will ''not age,'' nor experience birthdays + and will ''not age,'' nor experience birthdays. [[Enable aging|Intro Summary][$playerAging = 2]] | [[Semi aging|Intro Summary][$playerAging = 1]] <</if>> - . //This option cannot be changed during the game// <br><br> @@ -531,7 +525,7 @@ __''Player Character''__ //Make sure to replace your "s"s with "th"s to have working lisps in your lisped title.// <br><br> - Your nationality is <<textbox "$PC.nationality" $PC.nationality "Intro Summary">>//Capitalize it// + Your nationality (//Capitalize it//) is <<textbox "$PC.nationality" $PC.nationality "Intro Summary">> ,race is <<textbox "$PC.race" $PC.race "Intro Summary">>. and your skin tone is <<textbox "$PC.skin" $PC.skin "Intro Summary">>. @@ -589,13 +583,12 @@ __''Player Character''__ <<if ndef $PCCreationCareer>> <<set $PCCreationCareer = "ember of the idle wealthy">> <</if>> - <br> + <br><br> Before you came to the free cities you were a ''$PCCreationCareer'' and it is rumoured that you acquired your archology through ''$PC.rumor''. - __Past career:__ - <br> + <br>__Past career:__ <<if $PC.career != "arcology owner">> - [[member of the idle wealthy|Intro Summary][$PC.career = "wealth", $PCCreationCareer = "part of the idle wealthy"]] | + [[member of the idle wealthy|Intro Summary][$PC.career = "wealth", $PCCreationCareer = "member of the idle wealthy"]] [[business leader|Intro Summary][$PC.career = "capitalist", $PCCreationCareer ="business leader"]] | [[mercenary|Intro Summary][$PC.career = "mercenary", $PCCreationCareer ="mercenary"]] | [[slaver|Intro Summary][$PC.career = "slaver", $PCCreationCareer ="slaver"]] | @@ -607,41 +600,28 @@ __''Player Character''__ [[gang leader|Intro Summary][$PC.career = "gang", $PCCreationCareer ="gang leader"]] <</if>> - __rumor:__ - <br> + <br>__rumor:__ [[wealth|Intro Summary][$PC.rumor = "wealth"]] | [[hard work|Intro Summary][$PC.rumor = "diligence"]] | [[force|Intro Summary][$PC.rumor = "force"]] | [[social engineering|Intro Summary][$PC.rumor = "social engineering"]] | [[blind luck|Intro Summary][$PC.rumor = "luck"]] - <<if $PC.title == 1>> - <<set $PCCreationDick = "have">> - <<elseif $PC.title == -1>> - <<set $PCCreationVagina = "do not have">> - <</if>> - - <br>You currently ''$PCCreationDick'' a dick. - <<if $PC.dick == 1>> - [[Remove|Intro Summary][$PC.dick = 0, $PCCreationDick = "do not have"]] - <<else>> - [[Add|Intro Summary][$PC.dick = 1, $PCCreationDick = "have"]] - <</if>> - - <<if $PC.title == -1>> - <<set $PCCreationVagina = "have">> - <<elseif $PC.title == 1>> - <<set $PCCreationVagina = "do not have">> + <br><br> + You have a + <<if $PC.vagina == 1 && $PC.dick == 1>> + ''penis and vagina''. Sex scene variations; more difficult reputation maintenance; some unique opportunities, especially with breasts. + [[No penis|Intro Summary][$PC.dick = 0]] | [[No vagina|Intro Summary][$PC.vagina = 0]] + <<elseif $PC.dick == 1>> + ''penis''. Standard sex scenes; easiest reputation maintenance. + [[Switch to vagina|Intro Summary][$PC.dick = 0, $PC.vagina = 1]] | [[Add a vagina|Intro Summary][$PC.vagina = 1]] + <<elseif $PC.vagina == 1>> + ''vagina''. Sex scene variations; most difficult reputation maintenance. + [[Switch to penis|Intro Summary][$PC.dick = 1, $PC.vagina = 0]] | [[Add a penis|Intro Summary][$PC.dick = 1]] <</if>> - <br>You currently ''$PCCreationVagina'' a vagina. - <<if $PC.vagina == 1 && $PC.preg > 0>> - [[Remove|Intro Summary][$PC.vagina = 0, $PCCreationVagina = "do not have"]] - <<elseif $PC.vagina == 0 && $PC.preg == 0>> - [[Add|Intro Summary][$PC.vagina = 1, $PCCreationVagina = "have"]] - <</if>> - <<if $PC.vagina == 1>> + <br><br> <br>You are <<if $PC.preg == -1>> taking contraceptives. You ''can't'' get pregnant however there will be a slight increase to living expenses. @@ -673,49 +653,30 @@ __''Player Character''__ <<if $PC.boobs > 0>> <br><br> <<if ndef $PCCreationBoobSize && $PCCreationBreast>> - <<set $PCCreationBoobSize = "breasts", $PCCreationBreast = "real">> + <<set $PCCreationBoobSize = "noticeable breasts", $PCCreationBreast = "real">> <</if>> Your boobs are ''$PCCreationBoobSize'' and ''$PCCreationBreast''. <br> - [[big|Intro Summary][$PC.boobsBonus = 1, $PCCreationBoobSize = "big"]] - [[huge|Intro Summary][$PC.boobsBonus = 2, $PCCreationBoobSize = "huge"]] - [[cow tits|Intro Summary][$PC.boobsBonus = 3, $PCCreationBoobSize = "cow tits"]] - [[noticeable breasts|Intro Summary][$PC.boobsBonus = -0.5, $PCCreationBoobSize = "noticeable breasts"]] - [[average breasts|Intro Summary][$PC.boobsBonus = -1, $PCCreationBoobSize = "average breasts"]] - [[breasts|Intro Summary][$PC.boobsBonus = -2, $PCCreationBoobSize = "breasts"]] + [[(H cup) cow tits|Intro Summary][$PC.boobsBonus = 3, $PCCreationBoobSize = "cow tits"]] + [[(G cup) huge|Intro Summary][$PC.boobsBonus = 2, $PCCreationBoobSize = "huge"]] + [[(F cup) big|Intro Summary][$PC.boobsBonus = 1, $PCCreationBoobSize = "big"]] + [[(DD cup) noticeable breasts|Intro Summary][$PC.boobsBonus = 0 $PCCreationBoobSize = "noticeable breasts"]] + [[(D cup) average breasts|Intro Summary][$PC.boobsBonus = -0.5, $PCCreationBoobSize = "average breasts"]] + [[(C cup) breasts|Intro Summary][$PC.boobsBonus = -2, $PCCreationBoobSize = "breasts"]] <br> [[fake|Intro Summary][$PC.boobsImplant = 1, $PCCreationBreast = "fake"]] [[real|Intro Summary][$PC.boobsImplant = 0, $PCCreationBreast = "real"]] <</if>> <</if>> - - <br><br> - <<if $PC.vagina == 1 && $PC.dick == 1>> - ''penis and vagina''. Sex scene variations; more difficult reputation maintenance; some unique opportunities, especially with breasts. - [[No penis|Intro Summary][$PC.dick = 0]] | [[No vagina|Intro Summary][$PC.vagina = 0]] - <<elseif $PC.dick == 1>> - ''penis''. Standard sex scenes; easiest reputation maintenance. - [[Switch to vagina|Intro Summary][$PC.dick = 0, $PC.vagina = 1]] | [[Add a vagina|Intro Summary][$PC.vagina = 1]] - <<elseif $PC.vagina == 1>> - ''vagina''. Sex scene variations; most difficult reputation maintenance. - [[Switch to penis|Intro Summary][$PC.dick = 1, $PC.vagina = 0]] | [[Add a penis|Intro Summary][$PC.dick = 1]] - <<elseif $PC.vagina == 0 && $PC.dick == 0>> - ''null''. Odd things are likely to happen. - [[Add a vagina|Intro Summary][$PC.vagina = 1]] | [[Add a penis|Intro Summary][$PC.dick = 1]] | [[Add both|Intro Summary][$PC.dick = 1, $PC.vagina = 1]] - <</if>> - - - + <</if>> - -<br><br> - -__''Image display''__ +<br><br>__''Image display''__ <br> +Currently <<if $seeImages == 1>> ''enabled.'' [[Disable|Intro Summary][$seeImages = 0]] <br> @@ -801,41 +762,42 @@ __''Mods''__ <br><br> <<link "Continue">> <<if $freshPC == 1 || $saveImported == 0>> - <<if $PC.career == "capitalist">> - <<set $PC.trading = 100>> - <<elseif $PC.career == "mercenary">> - <<set $PC.warfare = 100>> - <<elseif $PC.career == "slaver">> - <<set $PC.slaving = 100>> - <<elseif $PC.career == "engineer">> - <<set $PC.engineering = 100>> - <<elseif $PC.career == "medicine">> - <<set $PC.medicine = 100>> - <<elseif $PC.career == "arcology owner">> - <<set $PC.trading = 100>> - <<set $PC.warfare = 100>> - <<set $PC.slaving = 100>> - <<set $PC.engineering = 100>> - <<set $PC.medicine = 100>> - <<elseif $PC.career == "escort">> - <<set $PC.trading = 50>> - <<set $PC.warfare = -100>> - <<set $PC.slaving = -100>> - <<set $PC.engineering = -100>> - <<set $PC.medicine = 10>> - <<elseif $PC.career == "servant">> - <<set $PC.trading = -100>> - <<set $PC.warfare = -100>> - <<set $PC.slaving = -100>> - <<set $PC.engineering = -100>> - <<set $PC.medicine = -100>> - <<elseif $PC.career == "gang">> - <<set $PC.trading = 50>> - <<set $PC.warfare = 50>> - <<set $PC.slaving = 50>> - <<set $PC.engineering = -100>> - <<set $PC.medicine = 0>> - <</if>> + <<switch $PC.career>> + <<case capitalist>> + <<set $PC.trading = 100>> + <<case mercenary>> + <<set $PC.warfare = 100>> + <<case slaver>> + <<set $PC.slaving = 100>> + <<case engineer>> + <<set $PC.engineering = 100>> + <<case medicine>> + <<set $PC.medicine = 100>> + <<case arcology owner>> + <<set $PC.trading = 100>> + <<set $PC.warfare = 100>> + <<set $PC.slaving = 100>> + <<set $PC.engineering = 100>> + <<set $PC.medicine = 100>> + <<case escort>> + <<set $PC.trading = 50>> + <<set $PC.warfare = -100>> + <<set $PC.slaving = -100>> + <<set $PC.engineering = -100>> + <<set $PC.medicine = 10>> + <<case servant>> + <<set $PC.trading = -100>> + <<set $PC.warfare = -100>> + <<set $PC.slaving = -100>> + <<set $PC.engineering = -100>> + <<set $PC.medicine = -100>> + <<case gang>> + <<set $PC.trading = 50>> + <<set $PC.warfare = 50>> + <<set $PC.slaving = 50>> + <<set $PC.engineering = -100>> + <<set $PC.medicine = 0>> + <</switch>> <</if>> <<set $girls = 2>> <<if $secExp == 1>> @@ -844,5 +806,9 @@ __''Mods''__ <<goto "init Nationalities">> <</link>> +<<if ($economy != 1) || ($seeDicks != 50) || ($continent != "North America") || ($internationalTrade != 1) || ($internationalVariety != 1) || ($seeRace != 1) || ($seeNationality != 1) || ($seeExtreme != 0) || ($seeCircumcision != 1) || ($seeAge != 1) || ($plot != 1)>> + //[[restore defaults|Intro Summary][$seeDicks = 50,$economy = 1,$continent = "North America",$internationalTrade = 1,$internationalVariety = 1,$seeRace = 1,$seeNationality = 1,$seeExtreme = 0,$seeCircumcision = 1,$seeAge = 1,$plot = 1]]// +<</if>> + <br><br> [[Cheat Start|init Nationalities][$cash += 1000000,$girls = 3,$rep += 10000,$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.trading = 100,$PC.warfare = 100,$PC.slaving = 100,$PC.engineering = 100,$PC.medicine = 100]] | //Intended for debugging: may have unexpected effects// diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index d68854b7e89..4a88eafa9ba 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -1551,4 +1551,4 @@ Her nationality is $activeSlave.nationality. <</if>> <</for>> -<<unset $PCCreationSex, $PCCreationFreckels, $PCCreationCareer, $PCCreationDick, $PCCreationVagina, $PCCreationBoobSize, $PCCreationBreast>> +<<unset $PCCreationSex, $PCCreationFreckels, $PCCreationCareer, $PCCreationBoobSize, $PCCreationBreast>> -- GitLab