diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js index c90792a201640226898268989b02b6984acb4b83..0f51ed8ece7a7fd65337a9552f15f3ed6e7f8fa7 100644 --- a/src/SpecialForce/JS.js +++ b/src/SpecialForce/JS.js @@ -68,9 +68,9 @@ window.Count = function() { T.Base = S.Firebase + S.Armoury + S.Drugs + S.Drones + T.H+T.SFF; T.BaseU = T.FU + T.AU + T.DrugsU + T.DU + T.HU+T.SFFU; } - if (V.terrain !== "oceanic") T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU; + if (V.terrain !== "oceanic") { T.LBU += T.GRU, T.LB += S.GiantRobot, T.Base += T.G, T.BaseU += T.GU; T.max = T.BaseU + T.LBU, V.SF.Units = T.Base + T.LB; - if (V.terrain === "oceanic" || V.terrain === "marine") { + } else { T.NY = S.AircraftCarrier + S.Sub + S.HAT, V.SF.Units += T.NY; T.NYU = T.ACU + T.SubU + T.HATU, T.max += T.NYU;} V.SF.Units = C(V.SF.Units, 0, T.max); diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw index 49899d18fb3e97f8105dbdabcb4c62181d663eea..dc06173356ef2ef2ac6c1a823f08f77c070aade6 100644 --- a/src/SpecialForce/Report.tw +++ b/src/SpecialForce/Report.tw @@ -130,7 +130,7 @@ <<if $SFUnit.GiantRobot > 0>> - <<set _FNGs += SF.GiantRobot,_Trade += 0.25*$SFUnit.GiantRobot,_ME *= 1+($SFUnit.GiantRobot)>> + <<set _FNGs += $SFUnit.GiantRobot,_Trade += 0.25*$SFUnit.GiantRobot,_ME *= 1+($SFUnit.GiantRobot)>> <</if>> @@ -168,7 +168,7 @@ <<if $SFTradeShow.History > 0>> <<set _ME *= 1+($SFTradeShow.History)>> <</if>> - <<if $LieutenantColonel == 1>> <<set _ME *= 1+($LieutenantColonel)>> <</if>> + <<if $SF.Facility.LC > 0>> <<set _ME *= 1+($SF.Facility.LC)>> <</if>> @@ -210,11 +210,11 @@ <<else>> <<set _FNGs += Math.ceil((_FNGs)*.25)>> <</if>> - <<if $SF.Target == "secure">> <<set $rep += Math.ceil($rep*((_Trade/100)*.95))>> + <<if $SF.Target == "secure">> <<set $rep += Math.ceil($rep+((_Trade/100)*.95))>> <<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.95))>> - <<else>> <<set $rep += Math.ceil($rep*((_Trade/100)*.25))>> + <<else>> <<set $rep += Math.ceil($rep+((_Trade/100)*.25))>> <<set $arcologies[0].prosperity = Math.ceil(($arcologies[0].prosperity+(_Trade/10)*.25))>>