From 1af3564e2481bec1f04e75e33bd9322a81734810 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 17 Jan 2018 14:52:12 -0500 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 +++ src/SecExp/transportHub.tw | 24 +++++----- src/events/intro/introSummary.tw | 46 ++++++++------------ src/uncategorized/corporationDevelopments.tw | 32 +++++++------- 4 files changed, 52 insertions(+), 56 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 6d4fde575fa..12aa402ca35 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,12 @@ 1/17/18 + 280 + -fixed multitude of problems brought in with v278 + + 279 + -fixed severe issue with "work as a servant" + 278 -variety of contributed fixes and corrections diff --git a/src/SecExp/transportHub.tw b/src/SecExp/transportHub.tw index 2c9f76a4391..00da212b3b5 100644 --- a/src/SecExp/transportHub.tw +++ b/src/SecExp/transportHub.tw @@ -4,7 +4,7 @@ <strong>The Transport Hub</strong> <hr> -You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. <<if $airport > 0>>Part of the structure is dedicated to air travel and the other is <<else Is<</if>> mainly occupied by <<if ($terrain != "oceanic" && $terrain != "marine") && $railway > 0>>the rail station.<<elseif if $terrain == "oceanic" || $terrain == "marine" && $docks > 0>> the docks.<</if>> +You quickly reach the transport hub, where a constant stream of vehicles, people and goods greets you. Part of the structure is dedicated to air travel and the other is mainly occupied by <<if $terrain != "oceanic" && $terrain != "marine">>the rail station.<<else>> the docks.<</if>> <<if $limitImmigration == 1 || $AntiImmigrationRep == 1>> Due to your strict policies concerning immigration, very few new citizens arrive in the transport hub. @@ -24,17 +24,7 @@ You quickly reach the transport hub, where a constant stream of vehicles, people The arcology's airport is huge and very well equipped. It can handle an impressive amount of traffic. <</if>> -<<if $terrain == "oceanic" || $terrain == "marine">> - <<if $docks == 1>> - The docks are old and small. They can handle some traffic, but not sustain commercial activity. - <<elseif $docks == 2>> - The docks are modern and efficient, but limited in size. They can handle some traffic, but not sustain commercial activity of significant size. - <<elseif $docks == 3>> - The docks are modern, efficient and expansive. They can handle a significant amount of traffic. - <<else>> - The docks are huge in size and high tech. They can handle an enormous amount of traffic. - <</if>> -<<elseif $terrain != "oceanic" && $terrain != "marine">> +<<if $terrain != "oceanic" && $terrain != "marine">> <<if $railway == 1>> The railway network is old and limited. It can handle some traffic, but not sustain commercial activity. <<elseif $railway == 2>> @@ -45,7 +35,15 @@ You quickly reach the transport hub, where a constant stream of vehicles, people The railway network is high tech and very far reaching. It can handle an enormous amount of traffic. <</if>> <<else>> - + <<if $docks == 1>> + The docks are old and small. They can handle some traffic, but not sustain commercial activity. + <<elseif $docks == 2>> + The docks are modern and efficient, but limited in size. They can handle some traffic, but not sustain commercial activity of significant size. + <<elseif $docks == 3>> + The docks are modern, efficient and expansive. They can handle a significant amount of traffic. + <<else>> + The docks are huge in size and high tech. They can handle an enormous amount of traffic. + <</if>> <</if>> <<if $hubSecurity == 1>> diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index e1bb034f93e..34b52ade053 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -538,9 +538,7 @@ __''Player Character''__ [[Extremely Pale|Intro Summary][$PC.skin = "extremely pale"]] <<switch $PC.markings>> - <<case none>> - <<set $PCCreationFreckels = "is clear of blemishes">> - <<case freckles>> + <<case "freckles">> <<set $PCCreationFreckels = "has light freckling">> <<case "heavily freckled">> <<set $PCCreationFreckels = "has heavy freckling">> @@ -569,26 +567,24 @@ __''Player Character''__ <</if>> <<switch $PC.career>> - <<case wealth>> - <<set $PCCreationCareer = "member of the idle wealthy">> - <<case capitalist>> - <<set $PCCreationCareer ="business leader">> - <<case mercenary>> - <<set $PCCreationCareer ="mercenary">> - <<case slaver>> - <<set $PCCreationCareer ="slaver">> - <<case engineer>> - <<set $PCCreationCareer ="engineer">> - <<case medicine>> - <<set $PCCreationCareer ="doctor">> - <<case celebrity>> - <<set $PCCreationCareer ="minor celebrity">> - <<case escort>> - <<set $PCCreationCareer ="escort">> - <<case servant>> - <<set $PCCreationCareer ="servant">> - <<case gang>> - <<set $PCCreationCareer ="gang leader">> + <<case "capitalist">> + <<set $PCCreationCareer = "business leader">> + <<case "mercenary">> + <<set $PCCreationCareer = "mercenary">> + <<case "slaver">> + <<set $PCCreationCareer = "slaver">> + <<case "engineer">> + <<set $PCCreationCareer = "engineer">> + <<case "medicine">> + <<set $PCCreationCareer = "doctor">> + <<case "celebrity">> + <<set $PCCreationCareer = "minor celebrity">> + <<case "escort">> + <<set $PCCreationCareer = "escort">> + <<case "servant">> + <<set $PCCreationCareer = "servant">> + <<case "gang">> + <<set $PCCreationCareer = "gang leader">> <<default>> <<set $PCCreationCareer = "member of the idle wealthy">> <</switch>> @@ -674,8 +670,6 @@ __''Player Character''__ <<set $PCCreationBoobSize = "unoticable C cups">> <<case -0.5>> <<set $PCCreationBoobSize = "unremarkable D cups">> - <<case 0>> - <<set $PCCreationBoobSize = "average DD cups">> <<case 1>> <<set $PCCreationBoobSize = "noticeable F cups">> <<case 2>> @@ -687,8 +681,6 @@ __''Player Character''__ <</switch>> <<switch $PC.boobsImplant>> - <<case 0>> - <<set $PCCreationBreast = "all natural">> <<case 1>> <<set $PCCreationBreast = "fake" <<default>> diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 887529306ca..e633bc7eea6 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -139,13 +139,13 @@ You hold <<print commaNum($personalShares)>> shares personally while <<print com <<if $cash > 1000*$sharePrice>> <<link "1000">><<set $personalShares += 1000>><<set $cash -= 1000*$sharePrice>><<set $corpCash += 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 1000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $cash > 5000*$sharePrice>> - <<link "5000">><<set $personalShares += 5000>><<set $cash -= 5000*$sharePrice>><<set $corpCash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 5000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> + | <<link "5000">><<set $personalShares += 5000>><<set $cash -= 5000*$sharePrice>><<set $corpCash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 5000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $cash > 10000*$sharePrice>> - <<link "10000">><<set $personalShares += 10000>><<set $cash -= 10000*$sharePrice>><<set $corpCash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 10000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> + | <<link "10000">><<set $personalShares += 10000>><<set $cash -= 10000*$sharePrice>><<set $corpCash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 10000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $cash > 15000*$sharePrice>> - <<link "15000">><<set $personalShares += 15000>><<set $cash -= 15000*$sharePrice>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 15000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> + | <<link "15000">><<set $personalShares += 15000>><<set $cash -= 15000*$sharePrice>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 15000 shares from the corporation, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $cash > 20000*$sharePrice>> - <<link "20000">><<set $personalShares += 20000>><<set $cash -= 20000*$sharePrice>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 20000 shares from the corporation, driving the share price up massively.">><</replace>><</link>><</if>> + | <<link "20000">><<set $personalShares += 20000>><<set $cash -= 20000*$sharePrice>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You purchased 20000 shares from the corporation, driving the share price up massively.">><</replace>><</link>><</if>> <<else>> You are unable to purchase 1000 shares at the current share price. <</if>> @@ -154,13 +154,13 @@ You are unable to purchase 1000 shares at the current share price. <<if $personalShares-1000 > $publicShares>> <<link "1000">><<set $publicShares += 1000>><<set $corpCash += 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 1000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-5000 > $publicShares>> - <<link "5000">><<set $publicShares += 5000>><<set $corpCash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 5000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> + | <<link "5000">><<set $publicShares += 5000>><<set $corpCash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 5000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-10000 > $publicShares>> - <<link "10000">><<set $publicShares += 10000>><<set $corpCash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 10000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> + | <<link "10000">><<set $publicShares += 10000>><<set $corpCash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 10000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-15000 > $publicShares>> - <<link "15000">><<set $publicShares += 15000>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 15000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> + | <<link "15000">><<set $publicShares += 15000>><<set $corpCash += 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 15000 new shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-20000 > $publicShares>> - <<link "20000">><<set $publicShares += 20000>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 20000 new shares, driving the share price down massively.">><</replace>><</link>><</if>> + | <<link "20000">><<set $publicShares += 20000>><<set $corpCash += 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "The corporation issued 20000 new shares, driving the share price down massively.">><</replace>><</link>><</if>> <<set _PublicOwnershipPercentage = (Math.trunc($publicShares/$personalShares))*100>> <<set _PrivateOwnershipPercentage = (Math.trunc($personalShares/$publicShares))*100>> @@ -170,13 +170,13 @@ You are unable to purchase 1000 shares at the current share price. <<if _PrivateOwnershipPercentage > 51 && $personalShares-1000 > $publicShares>> <<link "1000">><<set $personalShares -= 1000>><<set $publicShares += 1000>><<set $cash += 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 1000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-5000 > $publicShares>> - <<link "5000">><<set $personalShares -= 5000>><<set $publicShares += 5000>><<set $cash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 5000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> + | <<link "5000">><<set $personalShares -= 5000>><<set $publicShares += 5000>><<set $cash += 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 5000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-10000 > $publicShares>> - <<link "10000">><<set $personalShares -= 10000>><<set $publicShares += 10000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 10000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> + | <<link "10000">><<set $personalShares -= 10000>><<set $publicShares += 10000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 10000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-15000 > $publicShares>> - <<link "15000">><<set $personalShares -= 15000>><<set $publicShares += 15000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 15000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> + | <<link "15000">><<set $personalShares -= 15000>><<set $publicShares += 15000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 15000 shares, driving the share price down slightly.">><</replace>><</link>><</if>> <<if $personalShares-20000 > $publicShares>> - <<link "20000">><<set $personalShares -= 20000>><<set $publicShares += 20000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 20000 shares, driving the share price down massively.">><</replace>><</link>><</if>> + | <<link "20000">><<set $personalShares -= 20000>><<set $publicShares += 20000>><<set $cash += 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(90,95)))/100>><<replace "#CorpAction">><br><<print "You sold 20000 shares, driving the share price down massively.">><</replace>><</link>><</if>> <<if $cash > 1000*$sharePrice>> <br>Buy publicly held shares: @@ -184,13 +184,13 @@ You are unable to purchase 1000 shares at the current share price. <<if _PublicOwnershipPercentage < 49 && $publicShares > 1000 && $cash >= 1000*$sharePrice>> <<link "1000">><<set $personalShares += 1000>><<set $publicShares -= 1000>><<set $cash -= 1000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 1000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $publicShares >= 5000 && $cash >= 5000*$sharePrice>> - <<link "5000">><<set $personalShares += 5000>><<set $publicShares -= 5000>><<set $cash -= 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 5000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> + | <<link "5000">><<set $personalShares += 5000>><<set $publicShares -= 5000>><<set $cash -= 5000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 5000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $publicShares >= 10000 && $cash >= 10000*$sharePrice>> - <<link "10000">><<set $personalShares += 10000>><<set $publicShares -= 10000>><<set $cash -= 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 10000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> + | <<link "10000">><<set $personalShares += 10000>><<set $publicShares -= 10000>><<set $cash -= 10000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 10000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $publicShares >= 15000 && $cash >= 15000*$sharePrice>> - <<link "15000">><<set $personalShares += 15000>><<set $publicShares -= 15000>><<set $cash -= 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 15000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> + | <<link "15000">><<set $personalShares += 15000>><<set $publicShares -= 15000>><<set $cash -= 15000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 15000 shares, driving the share price up slightly.">><</replace>><</link>><</if>> <<if $publicShares >= 20000 && $cash >= 20000*$sharePrice>> - <<link "20000">><<set $personalShares += 20000>><<set $publicShares -= 20000>><<set $cash -= 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 20000 shares, driving the share price up massively.">><</replace>><</link>><</if>> + | <<link "20000">><<set $personalShares += 20000>><<set $publicShares -= 20000>><<set $cash -= 20000*$sharePrice>><<set $sharePrice = (Math.trunc($sharePrice*random(105,110)))/100>><<replace "#CorpAction">><br><<print "You bought 20000 shares, driving the share price up massively.">><</replace>><</link>><</if>> <<else>> You are unable to purchase 1000 shares at the current share price. <</if>> -- GitLab