diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index d6921a0fbc5a859b5b9fecaf500911137d77f50e..560a8c27e996e9234deb90e2e73ab61ed42070e3 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -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))>> - 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>> diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw index 3d48a0a15e744866c0d85364cc4a37d4db6207f9..09269e573cb30f1422de24a95054b855d8978664 100644 --- a/src/SpecialForce/Report.tw +++ b/src/SpecialForce/Report.tw @@ -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">> <<replace "#accountability">> ''No Accountability'' <</replace>> <</link>> <<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 _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>> <<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> <<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 $SF.MercCon.Revenue += _TSProfit>> <<if $secExp > 0 && $mercenaries > 0>> <<set $SF.MercCon.Mercs = 0>>