From c4aa5e38a1014c178987d62842c02790c59417d6 Mon Sep 17 00:00:00 2001 From: Jones <Jones> Date: Tue, 4 Dec 2018 16:14:18 +0100 Subject: [PATCH] line break tweaks Probably didn't fix everything, but it used to look awful, now it's a bit better. --- src/SecExp/securityReport.tw | 3 ++- src/uncategorized/arcmgmt.tw | 9 +++------ src/uncategorized/economics.tw | 10 +++------- src/uncategorized/neighborsDevelopment.tw | 3 ++- src/uncategorized/persBusiness.tw | 7 ++++--- src/uncategorized/reputation.tw | 1 + 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index 703cdd7f408..cb48bc883b6 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -205,7 +205,7 @@ <</if>> <<set $security = Math.clamp(_newSec, 0, 100)>> -<br> +<br><br> <strong>Crime</strong>: /* crime modifiers */ <<if $week < 30>> @@ -686,3 +686,4 @@ It will be finished in <<if $currentUpgrade.time == 1>> one week.<<else>><<print $currentUpgrade.time>> weeks.<</if>> <</if>> <</if>> +<br> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index abc464b6559..3adad68d924 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -580,8 +580,6 @@ _topClassP = 1>> <<set _middleClass += ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.subsidize + $TGA.subsidize + $TCR.subsidize + $TFS.subsidize + $HA.subsidize) * 20, _middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.subsidize + $TGA.subsidize + $TCR.subsidize + $TFS.subsidize + $HA.subsidize) * 0.01>> -<br> - /*Slave retirement trigger pulled (one time only)*/ <<if $CitizenRetirementTrigger == 1>> <<if $arcologies[0].FSSupremacistLawME < 1 && $arcologies[0].FSSubjugationistLawME < 1>> @@ -949,7 +947,6 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>> <br><<print _TCD>> Top Class Demand | <<print _topClassP>> TC Multiplier <</if>> <br> -<br> <<print $arcologies[0].name>> is home to the following: <br>Lower Class Citizens | <<print $lowerClass>> | <<print _percLowerClass>>% <br>Middle Class Citizens | <<print $middleClass>> | <<print _percMiddleClass>>% @@ -994,7 +991,6 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>> <</if>> <br> - <<set _rentMultiplier = 1>> <<if $arcologies[0].FSPaternalistLaw == 1>> <<set _rentMultiplier *= 0.95>> @@ -1478,10 +1474,10 @@ The Hippolyta Academy have a <<if $HA.schoolProsperity > 4>>very prosperous<<els You have a policy of covertly undermining them. <<set $HA.schoolProsperity-->> <</if>> -<</if>> - <</if>> <br> +<</if>> + <<if $marketAssistantLimit != 0>> <<silently>> <<= MenialPopCap()>> <</silently>> @@ -1523,3 +1519,4 @@ Your ''business assistant'' manages the menial slave market. <</if>> <<silently>><<= MenialPopCap()>><</silently>> <</if>> +<br> diff --git a/src/uncategorized/economics.tw b/src/uncategorized/economics.tw index e9e3a26c043..9f403ab05b3 100644 --- a/src/uncategorized/economics.tw +++ b/src/uncategorized/economics.tw @@ -22,15 +22,13 @@ <<include "Arcology Management">> -<br><br> - <<if $FSAnnounced > 0>> <br><br> <<include "FS Developments">> <</if>> <<if $corpAnnounced == 1>> - <br> + <br><br> <<if $corpIncorporated == 0>> <span id="incorporate"> You have not yet committed funds to create a publicly traded slave trading corporation. <<link "Lay the groundwork for incorporation">><<set $corpIncorporated = 1>><<set $sharePrice = 10>><<set $oldSharePrice = $sharePrice>><<set $personalShares = 2000>><<set $cash -= 30000>><<set $publicShares = 1000>><<set $corpCash = 20000>><<set $generalAssets = 500>><<set $slaveAssets = 1000>><<set $entrapmentAssets = 500>><<set $captureAssets = 500>><<set $trainingAssets = 500>><<set $surgicalAssets = 500>><<set $drugAssets = 500>><<replace "#incorporate">><<print "The groundwork has been laid for the incorporation of a publicly traded slave trading corporation. The IPO will involve 1000 shares at <<print cashFormat(10)>>/share.">><</replace>><</link>> //Costs <<print cashFormat(30000)>>// @@ -38,19 +36,17 @@ <<else>> <<include "Corporation Developments">> <</if>> - <br><br> <</if>> <<if $secExp == 1>> <br><br> <<include "authorityReport">> -<</if>> - <br><br> -<<if $secExp == 1>> <<include "securityReport">> <</if>> +<br><br> + <<include "Reputation">> <br><br> diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 7af350ada56..fdf403477ba 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -2696,7 +2696,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<if $plot>> <<if $peacekeepers != 0>> - <br><br> + <br> <<if $peacekeepers.strength >= 50>> <<set _prisoners = Math.trunc($peacekeepers.attitude/10)+random(0,10)>> General $peacekeepers.generalName's little empire near the arcology @@ -2730,5 +2730,6 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol Unfortunately, the presence of so much old world military power near the Free City causes @@.red;public concern.@@ <<set $rep -= 100>> <</if>> + <br> <</if>> <</if>> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index bcb753e4a48..51d0041715b 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -800,9 +800,9 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@ <<set $cash -= $costs>> <<if $secExp == 1>> - <br> - <br> <<if $weapManu == 1>> + <br> + <br> The weapons manufacturing complex produces armaments <<if $weapProductivity <= 2>> at a steady pace. @@ -852,9 +852,9 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@ <br>Fees on transitioning goods this week made @@.yellowgreen;<<print cashFormat(_tradeTax)>>.@@ <<set $cash += Math.ceil(_tradeTax)>> <</if>> + <br> <</if>> -<br> /*Adding random changes to slave demand and supply*/ /*Without events triggering and a relatively average supply/demand situation, the best case scenario is an increase/decrease in the price of slaves of 10 in one week. Chance of these conditions happening are 1/25. For demand or supply to go from average to their maximum will take 25 weeks if rolling highest growth each time a roll is made and all other luck is average. Because of the properties of the market and how it develops the likely prices one will encounter are distributed in a bellshaped fashion, centered around 1000. Minimum possible price is 750, maximum 1250. At +/- 35000 chances of supply or demand getting even more extreme are reduced.*/ <<set _demandSlaveVar = random(-10,10)*10>> @@ -1061,3 +1061,4 @@ The RomanFS may need further tweaking (it probably got weaker). Could increase t <</if>> <<if $SF.Toggle && $SF.Active >= 1>> <<include "SF_Report">> <</if>> +<br> diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw index 507b40da420..20b786574b2 100644 --- a/src/uncategorized/reputation.tw +++ b/src/uncategorized/reputation.tw @@ -787,3 +787,4 @@ On formal occasions, you are announced as $PCTitle. The Societal Elite @@.red;mutter about you@@. <</if>> <</if>> +<br> -- GitLab