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

fixed what I hope is an error

parent 310678b4
No related branches found
No related tags found
1 merge request!3268fixed what I hope is an error
...@@ -76,9 +76,9 @@ ...@@ -76,9 +76,9 @@
<<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>> <<if $SF.MercCon.History >= 1 && ((Math.trunc(($week-1)/24) === ($week-1)/24) || (Math.trunc(($week-2)/24) === ($week-2)/24) || (Math.trunc(($week-3)/24) === ($week-3)/24))>>
While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.V.SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower. While at the recent merc meetup, the Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print commaNum($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print commaNum($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower.
<br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.V.SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups. <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print commaNum($SF.MercCon.TotalMenials)>> menial slaves and <<print commaNum($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</if>> <</if>>
......
...@@ -186,13 +186,13 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week ...@@ -186,13 +186,13 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week
| <<link "No Accountability">> <<set $SF.Regs = "none">> | <<link "No Accountability">> <<set $SF.Regs = "none">>
<<replace "#accountability">> ''No Accountability'' <</replace>> <</link>> <<replace "#accountability">> ''No Accountability'' <</replace>> <</link>>
<<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'': <<if $SF.MercCon.View > 0 && $SF.MercCon.CanAttend === 1>> <br>''TradeShow'':
<<set $SF.MercCon.Income = 0,$SF.V.SF.MercCon.Menials = 0>> <<set $SF.MercCon.Income = 0,$SF.MercCon.Menials = 0>>
<<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>> <<set _TradeShowAttendes = 200,_MenialSlavesPerAttendee = 5>>
<<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>> <<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>>
<<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>> <<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>>
During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendees, some decided to also give her some menial slaves as a bonus.<br> During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendees, some decided to also give her some menial slaves as a bonus.<br>
<<set $menials += _MenialSlaves>> <<set $menials += _MenialSlaves>>
<<set $SF.V.SF.MercCon.Menials += _MenialSlaves,$SF.V.SF.MercCon.TotalMenials += _MenialSlaves>> <<set $SF.MercCon.Menials += _MenialSlaves,$SF.MercCon.TotalMenials += _MenialSlaves>>
<<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>> <<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>>
<<set $SF.MercCon.Revenue += _TSProfit>> <<set $SF.MercCon.Revenue += _TSProfit>>
<<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>> <<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>>
......
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