Skip to content
Snippets Groups Projects
Commit f84969f8 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'fixes' into 'pregmod-master'

Fixes

Closes #448

See merge request pregmodfan/fc-pregmod!3438
parents cbe8d86c aff6fc15
No related branches found
No related tags found
No related merge requests found
...@@ -2626,6 +2626,7 @@ Setting missing global variables: ...@@ -2626,6 +2626,7 @@ Setting missing global variables:
<<set $corpEasy = 0>> <<set $corpEasy = 0>>
<</if>> <</if>>
<</if>> <</if>>
<<set $dividendTimer = $dividendTimer || 13>>
/*Removing the old Corp from save*/ /*Removing the old Corp from save*/
<<if ndef $newCorp>> <<if ndef $newCorp>>
......
...@@ -418,7 +418,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>> ...@@ -418,7 +418,7 @@ _corpDivWhoreSlavesRoom = corpDivWhoreSlavesRoom()>>
$corpDivTrainSlaves2 = 0>> $corpDivTrainSlaves2 = 0>>
to the market and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@ to the market and made @@.yellowgreen;<<print cashFormat(_corpDivTrainRev)>>.@@
<</if>> <</if>>
<<elseif $corpDivTrainSlaves2 > 0>>It is holding <<if $corpDivTrainSlaves2 > 1>>$corpDivTrainSlaves2 trained slaves<<else>>one trained slave<<else>> at the end of the week.<</if>> <<elseif $corpDivTrainSlaves2 > 0>>It is holding <<if $corpDivTrainSlaves2 > 1>>$corpDivTrainSlaves2 trained slaves<<elseif $corpDivTrainSlaves2 == 1>>one trained slave<<else>> at the end of the week.<</if>>
<<if $corpDivTrainSlaves2 > Math.trunc($corpDivTrainDev * 0.4)>> <<if $corpDivTrainSlaves2 > Math.trunc($corpDivTrainDev * 0.4)>>
<<if $corpDivTrainSurgeryTimer < 5 || $corpDivSurgery == 0>> <<if $corpDivTrainSurgeryTimer < 5 || $corpDivSurgery == 0>>
<<set _corpDivTrainCapSlaves = $corpDivTrainSlaves2 - Math.trunc($corpDivTrainDev * 0.4), <<set _corpDivTrainCapSlaves = $corpDivTrainSlaves2 - Math.trunc($corpDivTrainDev * 0.4),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment