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.

Sign up for GitHub

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

Added hotkey for chatter module #447

Merged
merged 4 commits into from
Jan 23, 2019
Merged

Added hotkey for chatter module #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9d2e5e
Added hotkey for chatter module, resolved #366
CreepPork Jan 12, 2019
5b5a362
Merge branch 'master' into hotkeyChatterModule
Kexanone Jan 21, 2019
d120f6c
Fixed bugs
CreepPork Jan 21, 2019
b7d9a6f
Merge branch 'hotkeyChatterModule' of https://github.com/ArmaAchilles…
CreepPork Jan 21, 2019
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
2 changes: 1 addition & 1 deletion @AresModAchillesExpansion/addons/functions_f_achilles/functions/features/fn_chatter.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// DATE: 4/11/16
// VERSION: 2.0
// FILE: Achilles\functions_f_achilles\functions\features\fn_chatter.sqf
// DESCRIPTION: AI chatter in chat
// DESCRIPTION: AI chatter in chat (has to be in scheduled enviornment)
//
// ARGUMENTS:
// _this select 0: OBJECT - unit that chatter; if ObjNull then HQ chatters
Expand Down
4 changes: 4 additions & 0 deletions @AresModAchillesExpansion/addons/language_f/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7414,6 +7414,10 @@
<French>Basculer entre l'apparition des vehicules avec et sans l'équipage</French>
<Spanish>Intercambia entre generar vehículos con y sin tripulación</Spanish>
<Russian>Спавн техники с экипажем/без экипажа</Russian>
</Key>
<Key ID="STR_AMAE_KEY_CHATTER">
<Original>Show Chatter module</Original>
<English>Show Chatter module</English>
</Key>
</Container>
</Package>
Expand Down
15 changes: 13 additions & 2 deletions @AresModAchillesExpansion/addons/settings_f/scripts/keybindings.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,17 @@
missionNamespace setVariable ["Achilles_var_toggleCrewOnSpawn", nil];
((findDisplay 312) displayCtrl 2801) cbSetChecked true;
};
},
[0x0, [false, false, false]]
}
] call CBA_fnc_addKeybind;

[
localize "STR_AMAE_ACHILLES",
"Achilles_id_chatter",
localize "STR_AMAE_KEY_CHATTER",
"",
{
private _units = ["man"] call Achilles_fnc_getCuratorSelected;

[_units select 0] spawn Achilles_fnc_chatter;
}
] call CBA_fnc_addKeybind;