Merge pull request #3147 from Tiny-DM/3.5.1-fixes

3.5.1 Undercover and Defend fixes
official-antistasi-community · Feb 18, 2024 · 5aeba0a · 5aeba0a
2 parents 61e1c61 + 5adeb8d
commit 5aeba0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/A3A/addons/core/Stringtable.xml b/A3A/addons/core/Stringtable.xml
@@ -2414,7 +2414,7 @@
         <Korean>%1 세력이 %2에 있는 우리 주둔군을 상대로 대대적인 공격을 시작하고 있습니다. 가능하면 그들을 저지하거나, 살아남아 다른 날에 싸우십시오.</Korean>
       </Key>
       <Key ID="STR_A3A_fn_base_wavedAttack_other">
-        <Original>"%1 is attacking the %2 garrison at %3.</Original>
+        <Original>%1 is attacking the %2 garrison at %3.</Original>
         <Korean>%1 세력이 %3에 있는 %2의 주둔군을 공격하고 있습니다.</Korean>
       </Key>
       <Key ID="STR_A3A_fn_base_wavedAttack_title">
@@ -13539,11 +13539,11 @@
         <Chinesesimp>面向玩家并与其互动</Chinesesimp>
       </Key>
       <Key ID="STR_antistasi_dialogs_radio_comm_undercover">
-        <Original>Undercover Toggle</Original>
+        <Original>Undercover ON</Original>
         <Korean>위장 토글</Korean>
       </Key>
       <Key ID="STR_antistasi_dialogs_radio_comm_undercover_tooltip">
-        <Original>Become Undercover if you match the requirements. Enemy AI won't attack you until they discover you. Using this while undercover will remove your undercover status.</Original>
+        <Original>Become Undercover if you match the requirements. Enemy AI won't attack you until they discover you.</Original>
         <Korean>요구 사항과 일치하는 경우 위장이 시작됩니다. 적 AI는 당신을 알아볼 때까지 당신을 공격하지 않을 것입니다. 위장 중에 이 기능을 다시 사용하면 위장 상태가 해제됩니다.</Korean>
       </Key>
       <Key ID="STR_antistasi_dialogs_radio_comm_unlock_vehicle">

diff --git a/A3A/addons/core/functions/CREATE/fn_attackHQ.sqf b/A3A/addons/core/functions/CREATE/fn_attackHQ.sqf
@@ -24,7 +24,7 @@ bigAttackInProgress = true; publicVariable "bigAttackInProgress";
 forcedSpawn pushBack "Synd_HQ"; publicVariable "forcedSpawn";
 
 private _taskId = "DEF_HQ" + str A3A_taskCount;
-[[teamPlayer,civilian],_taskId, localize "STR_A3A_fn_base_attackHQ_defendLong", localize "STR_A3A_fn_base_attackHQ_defendTitle",respawnTeamPlayer,_targPos,true,10,true,"Defend",true] call BIS_fnc_taskCreate;
+[[teamPlayer,civilian],_taskId,[localize "STR_A3A_fn_base_attackHQ_defendLong", localize "STR_A3A_fn_base_attackHQ_defendTitle",respawnTeamPlayer],_targPos,true,10,true,"Defend",true] call BIS_fnc_taskCreate;
 [_taskId, "DEF_HQ", "CREATED"] remoteExecCall ["A3A_fnc_taskUpdate", 2];
 
 

diff --git a/A3A/addons/core/functions/Undercover/fn_goUndercover.sqf b/A3A/addons/core/functions/Undercover/fn_goUndercover.sqf
@@ -36,10 +36,6 @@ Example:
 FIX_LINE_NUMBERS()
 private _layer = ["A3A_infoCenter"] call BIS_fnc_rscLayer;
 
-if (captive player) exitWith {
-    player setCaptive false;
-    [localize "STR_A3A_fn_undercover_goUn_off", 0, 0, 4, 0, 0, _layer] spawn bis_fnc_dynamicText;
-};
 private _titleStr = localize "STR_A3A_fn_undercover_title";
 private _result = [] call A3A_fnc_canGoUndercover;