Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: Order from horn doesn't work after firing from the vehicle #1260

Merged
merged 2 commits into from
Dec 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/int/horn.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,15 @@ private _veh = vehicle player;
if (
_veh isEqualTo player ||
{visibleMap} ||
{driver _veh isNotEqualTo player} ||
{time < btc_int_hornDelay + 1}
) exitWith {};

params ["_displayOrControl", "_button"];
if (_button isNotEqualTo 0) exitWith {};

private _weapon = currentWeapon _veh;
if (
_weapon isNotEqualTo "" &&
{!(_weapon isKindOf ["CarHorn", configFile >> "CfgWeapons"])}
) exitWith {};

private _weapon = (weaponState [_veh, _veh unitTurret player]) select 0;
if !(_weapon isKindOf ["CarHorn", configFile >> "CfgWeapons"]) exitWith {};

[
1,
objNull,
Expand Down
2 changes: 1 addition & 1 deletion =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
</Container>
<Container name="Documentation: Orders">
<Key ID="STR_BTC_HAM_DOC_ORDERS_TEXT">
<Original>Any player can give orders to civilians.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\interact_ca.paa' width='20' height='20'/&gt; To do this, just open your self interaction menu and select 'ORDERS' or use one of the shortcuts. Shortcuts can changed under 'configure' &gt;&gt; 'controls' &gt;&gt; 'configure addons' &gt;&gt; 'Hearts and Minds: Mission' (drop down menu).&lt;br/&gt; Your options are:&lt;br/&gt; - STOP&lt;br/&gt; - GET DOWN&lt;br/&gt; - GO AWAY&lt;br/&gt;&lt;br/&gt; If you want to give an order to just one unit, interact with it (ace object interaction).&lt;br/&gt; You can also use a horn to ask civilians to stop their mouvement from a vehicle. Turning ON beacons or siren will continuously ask civilians to let you pass first. Combining beacons and siren will increase the range of effectiveness.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; You can also drop leaflets to ask all civilians in a circle of 200m to evacuate to a religious building (if not available a safe area) with a AR-2 drone.&lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\orange_leaflets_overview_ca.paa' width='355' height='200'/&gt;</Original>
<Original>Any player can give orders to civilians.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\interact_ca.paa' width='20' height='20'/&gt; To do this, just open your self interaction menu and select 'ORDERS' or use one of the shortcuts. Shortcuts can changed under 'configure' &gt;&gt; 'controls' &gt;&gt; 'configure addons' &gt;&gt; 'Hearts and Minds: Mission' (drop down menu).&lt;br/&gt; Your options are:&lt;br/&gt; - STOP&lt;br/&gt; - GET DOWN&lt;br/&gt; - GO AWAY&lt;br/&gt;&lt;br/&gt; If you want to give an order to just one unit, interact with it (ace object interaction).&lt;br/&gt; You can also use a horn to ask civilians to stop their movement from a vehicle. Turning ON beacons or siren will continuously ask civilians to let you pass first. Combining beacons and siren will increase the range of effectiveness.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; You can also drop leaflets to ask all civilians in a circle of 200m to evacuate to a religious building (if not available a safe area) with a AR-2 drone.&lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\orange_leaflets_overview_ca.paa' width='355' height='200'/&gt;</Original>
<Spanish>Cualquier jugador puede dar órdenes a civiles.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\interact_ca.paa' width='20' height='20'/&gt; Para ello, sólo tienes que abrir el menú de auto-interacción y seleccionar `ORDENES' o utilizar uno de los accesos directos. Los accesos directos pueden cambiarse en 'configuración'. &gt;&gt; 'controls' &gt;&gt; 'configure addons' &gt;&gt; 'Hearts and Minds: Mission' (menu desplegable).&lt;br/&gt; Tus opciones son:&lt;br/&gt; - ALTO&lt;br/&gt; - AGACHATE&lt;br/&gt; - FUERA DE AQUI&lt;br/&gt;&lt;br/&gt; Si quieres dar una orden a una sola unidad, interactúa con ella (ace object interaction).&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; También puede tirar panfletos para pedir a todos los civiles en un círculo de 200 metros que evacuen a un edificio religioso (si no está disponible un área segura) con un drone&lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\orange_leaflets_overview_ca.paa' width='355' height='200'/&gt;</Spanish>
<German>Jeder Spieler kann einem Zivlisten Anweisungen geben.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\interact_ca.paa' width='20' height='20'/&gt; Dies geht recht einfach in dem man das Eigen-Interaktionsmenü öffnet und dann 'BEFEHLE(ZIVILISTEN)' auswählt. Oder in dem man Kurztasten nutzt. Diese können unter 'Konfigurieren' &gt;&gt; 'Steuerung' &gt;&gt; 'Modifikationen anpassen' &gt;&gt; Hearts and Minds: Mission' (Drop-Down-Menü) geändert werden.&lt;br/&gt;&lt;br/&gt; Folgende Optionen stehen zur Verfügung:&lt;br/&gt; - STOPP!&lt;br/&gt; - AUF DEN BODEN!&lt;br/&gt; - GEH WEG!&lt;br/&gt;&lt;br/&gt; Wenn Sie einen Befehl an eine bestimmte Person geben wollen, so können Sie auch direkt mir dieser Interagieren (ACE Objekt-Interaction).&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; Sie können mithilfe einer Drohne Broschüren abwerfen, um die Zivilisten im Umkreis von ca. 200 m aufzufordern, sich in dem nächsten religiösen Gebäude einzufinden (sollte kein Gebäude vorhanden sein, so wird ein sicherer Bereich festgelegt).&lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\orange_leaflets_overview_ca.paa' width='355' height='200'/&gt;</German>
<Portuguese>Qualquer jogador pode dar instruções a um civil.&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\interact_ca.paa' width='20' height='20'/&gt; Para fazer isso, basta abrir o menu de interação do civil e selecionar a opção "ORDENS" ou usar tecla de atalho. Atalhos podem ser alterados no menu "CONFIGURAÇÃO" &gt;&gt; "CONTROLES" &gt;&gt; "CONFIGURAR COMPLEMENTOS (ADDONS)" &gt;&gt; Corações e Mentes: Missão (Menu suspenso).&lt;br/&gt;&lt;br/&gt; As seguintes opções estão disponíveis: &lt;br/&gt; - PARE!&lt;br/&gt; - DEITADO!&lt;br/&gt; - VÁ EMBORA!&lt;br/&gt;&lt;br/&gt; Se você quiser dar uma ordem para apenas uma unidade, interaja com ela (interação do objeto ACE).&lt;br/&gt; &lt;img image='\A3\ui_f\data\igui\cfg\simpleTasks\types\meet_ca.paa' width='20' height='20'/&gt; Você pode usar um drone para soltar panfletos solicitando que civis, dentro de um raio de 200m, se abriguem em um prédio religioso mais próximo (se não houver prédio, uma área segura será definida).&lt;br/&gt;&lt;br/&gt; &lt;img image='\a3\missions_f_orange\Data\Img\orange_leaflets_overview_ca.paa' width='355' height='200'/&gt;</Portuguese>
Expand Down
2 changes: 1 addition & 1 deletion docs/InGame-documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ Any player can give orders to civilians. To do this, just open your self interac

If you want to give an order to just one unit, interact with it (object interaction).

You can also use a horn to ask civilians to stop their mouvement from a vehicle. Turning ON beacons or siren will continuously ask civilians to let you pass first. Combining beacons and siren will increase the range of effectiveness.
You can also use a horn to ask civilians to stop their movement from a vehicle. Turning ON beacons or siren will continuously ask civilians to let you pass first. Combining beacons and siren will increase the range of effectiveness.

You can also drop leaflets to ask all civilians in a circle of 200m to evacuate to a religious building (if not available a safe area) with a AR-2 drone.

Expand Down