diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw index 5ba1c110f3fff722998f4d531b97bb8d2a8c7952..6bb61d65d9275354f25b2d49ef47ff12e45de7ea 100644 --- a/src/SpecialForce/Firebase.tw +++ b/src/SpecialForce/Firebase.tw @@ -45,22 +45,22 @@ <<if $SF.UC.Lock < 1>> <br> <<switch $SF.UC.Assign>> <<case 0>> - <br>No soldiers are working undercover. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] + <br>No soldiers are working undercover, which would primarly advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]] <<case 1>> - <br>A small section of soldiers are working undercover. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] + <br>A small section of soldiers are working undercover, which will primarly advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]] <<case 2>> - <br>A large section of soldiers are working undercover. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] + <br>A large section of soldiers are working undercover, which will primarly advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]] <br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]] <<default>> - <br>Would you like to assign soldiers to undercover duty? + <br>Would you like to assign soldiers to undercover duty, which will primarly advance your cultural goals? <br>[[Do not assign soldiers to work undercover|Firebase][$SF.UC.Assign = 0]] <br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.UC.Assign = 1]] <br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.UC.Assign = 2]] <</switch>> <<else>> - <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]] + <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work, which will primarly advance your cultural goals. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]] <</if>> <<if $SF.Squad.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>> diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js index 38d04553b3879acf3d41f6af6fbf98bdff7b4446..60e96edd529e64f483b7938706d5d5e5694971ca 100644 --- a/src/SpecialForce/SpecialForce.js +++ b/src/SpecialForce/SpecialForce.js @@ -2602,17 +2602,25 @@ App.SF.AAR = function(endWeekCall = 1) { r += ` ${V.SF.Caps} managed to recruit ${FNG} new soldiers this week, and your reputation has <span class='green'>increased through the improvement of trade security</span>.`; r += `<br>//Your instructions to ${App.SF.SFC()}://`; - r += `<br> Deployment focus: `; // The below lines are indented to increase readability. + r += `<br> Deployment focus: `; r += `<span id="focus"> <<if $SF.Target == "recruit">>''Recruiting and Training''<<elseif $SF.Target == "secure">>''Securing Trade Routes''<<else>>''Raiding and Slaving''<</if>></span>. `; - r += `<<link "Recruit and Train">> <<set $SF.Target="recruit">> <<replace "#focus">>''Recruiting and Training''<</replace>> <</link>> | <<link "Secure Trade Routes">> <<set $SF.Target="secure">> <<replace "#focus">>''Securing Trade Routes''<</replace>> <</link>> | <<link "Raiding and Slaving">> <<set $SF.Target="raiding">> <<replace "#focus">>''Raiding and Slaving''<</replace>> <</link>>`; + r += `<br> <<link "Recruit and Train">> <<set $SF.Target = "recruit">> <<replace "#focus">>''Recruiting and Training''<</replace>> <</link>> //Increases the amount of FNG's at the cost of revenue.//`; + r+= `<br> <<link "Secure Trade Routes">> <<set $SF.Target = "secure">> <<replace "#focus">>''Securing Trade Routes''<</replace>> <</link>> //Increases trade and reputation at the cost of revenue.//`; + r += `<br> <<link "Raiding and Slaving">> <<set $SF.Target = "raiding">> <<replace "#focus">>''Raiding and Slaving''<</replace>> <</link>> //Increases revenue at the cost of less FNG's and increased force depravity.//`; - r += `<br> Rules of Engagement: `; // The below lines are indented to increase readability. + r += `<br> Rules of Engagement: `; r += `<span id="roe"> <<if $SF.ROE === "hold">>''Hold Fire''<<elseif $SF.ROE === "limited">>''Limited Fire''<<else>>''Free Fire''<</if>></span>. `; - r += `<<link "Hold Fire">> <<set $SF.ROE="hold">> <<replace "#roe">>''Hold Fire''<</replace>> <</link>> | <<link "Limited Fire">> <<set $SF.ROE="limited">> <<replace "#roe">>''Limited Fire''<</replace>> <</link>> | <<link "Free Fire">> <<set $SF.ROE="free">> <<replace "#roe">>''Free Fire''<</replace>> <</link>>`; + r += `<br> <<link "Hold Fire">> <<set $SF.ROE = "hold">> <<replace "#roe">>''Hold Fire''<</replace>> <</link>> //Reduces force depravity.//`; + r += `<br> <<link "Limited Fire">> <<set $SF.ROE = "limited">> <<replace "#roe">>''Limited Fire''<</replace>> <</link>> //Does not adjust force depravity.//`; + r += `<br> <<link "Free Fire">> <<set $SF.ROE = "free">> <<replace "#roe">>''Free Fire''<</replace>> <</link>> //Increases force depravity.//`; - r += `<br> Accountability: `; // The below lines are indented to increase readability. + r += `<br> Accountability: `; r += `<span id="accountability"> <<if $SF.Regs === "strict">>''Strict Accountability''<<elseif $SF.Regs === "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>. `; - r += `<<link "Strict Accountability">> <<set $SF.Regs="strict">> <<replace "#accountability">>''Strict Accountability''<</replace>> <</link>> | <<link "Some Accountability">> <<set $SF.Regs="some">> <<replace "#accountability">>''Some Accountability''<</replace>> <</link>> | <<link "No Accountability">> <<set $SF.Regs="none">> <<replace "#accountability">>''No Accountability''<</replace>> <</link>>`; + r += `<br> <<link "Strict Accountability">> <<set $SF.Regs = "strict">> <<replace "#accountability">>''Strict Accountability''<</replace>> <</link>> //Reduces force depravity.//`; + r += `<br> <<link "Some Accountability">> <<set $SF.Regs = "some">> <<replace "#accountability">>''Some Accountability''<</replace>> <</link>> //Does not adjust force depravity.//`; + r += `<br> <<link "No Accountability">> <<set $SF.Regs = "none">> <<replace "#accountability">>''No Accountability''<</replace>> <</link>> //Increases force depravity.//`; + + r += `<br><br>Force depravity effects trade.`; if (V.SF.MercCon.CanAttend === 1) { V.SF.MercCon.Income = 0; @@ -2649,7 +2657,7 @@ App.SF.AAR = function(endWeekCall = 1) { App.SF.Count = function() { const V = State.variables, T = State.temporary, - C = Math.clamp, // sure that's correct? + C = Math.clamp, // sure that's correct? // Yes it works as inteded. S = V.SF.Squad, E = V.economy; T.FU = 10; diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw index c11d0e860b302238a95a02f3e3db4d7e5b493bb8..9a32541d5bbe549480e37a236e1a59a368aed664 100644 --- a/src/uncategorized/fsDevelopments.tw +++ b/src/uncategorized/fsDevelopments.tw @@ -95,7 +95,7 @@ /* Spending, terrain, rep effects */ <<set _broadProgress = 0>> <<if $SF.Toggle && $SF.Active >= 1 && $SF.UC.Assign > 0 && $SF.UC.num > 0>> - Assigning a <<if $SF.UC.Assign === 1>>small<<else>>large<</if>> portion of $SF.Lower to undercover work helps forward your goals for your arcology's future. + Assigning a <<if $SF.UC.Assign === 1>>small<<else>>large<</if>> portion of $SF.Lower to undercover work helps to advance your cultural goals. <<set _broadProgress += $SF.UC.num/100>> <br> <</if>> <<if $FSSpending > 1>>