mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Prevent interaction if unit(s) climbing the ladder, Disable tilting, Split adjust string into adjust and tilt
This commit is contained in:
parent
d36543d3a9
commit
c0aaf05eaf
@ -68,7 +68,7 @@ class CfgVehicles {
|
|||||||
class ACE_MainActions {
|
class ACE_MainActions {
|
||||||
selection = "roadway";
|
selection = "roadway";
|
||||||
distance = 5;
|
distance = 5;
|
||||||
condition = "true";
|
condition = QUOTE(_target call FUNC(isLadderEmpty));
|
||||||
|
|
||||||
class ACE_PickUp {
|
class ACE_PickUp {
|
||||||
selection = "";
|
selection = "";
|
||||||
|
@ -10,6 +10,7 @@ PREP(handleInteractMenuOpened);
|
|||||||
PREP(handlePlayerChanged);
|
PREP(handlePlayerChanged);
|
||||||
PREP(handleScrollWheel);
|
PREP(handleScrollWheel);
|
||||||
PREP(handleUnconscious);
|
PREP(handleUnconscious);
|
||||||
|
PREP(isLadderEmpty);
|
||||||
PREP(pickupTL);
|
PREP(pickupTL);
|
||||||
PREP(positionTL);
|
PREP(positionTL);
|
||||||
|
|
||||||
|
@ -40,9 +40,9 @@ if (GETMVAR(ACE_Modifier,0) == 0) then {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
// Tilting
|
// Tilting (disabled due to sinking, interaction point offset and unsuitable animation)
|
||||||
GVAR(currentAngle) = 0 max (GVAR(currentAngle) + _scroll) min 30;
|
//GVAR(currentAngle) = 0 max (GVAR(currentAngle) + _scroll) min 30;
|
||||||
GVAR(ladder) animate ["rotate", GVAR(currentAngle)];
|
//GVAR(ladder) animate ["rotate", GVAR(currentAngle)];
|
||||||
};
|
};
|
||||||
|
|
||||||
true
|
true
|
||||||
|
31
addons/tacticalladder/functions/fnc_isLadderEmpty.sqf
Normal file
31
addons/tacticalladder/functions/fnc_isLadderEmpty.sqf
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Author: Jonpas
|
||||||
|
* Checks if Tactical Ladder is empty (no one climbing it).
|
||||||
|
*
|
||||||
|
* Arguments:
|
||||||
|
* 0: Ladder <OBJECT>
|
||||||
|
*
|
||||||
|
* Return Value:
|
||||||
|
* Can Be Picked Up <BOOL>
|
||||||
|
*
|
||||||
|
* Example:
|
||||||
|
* [ladder] call ace_tacticalladder_fnc_isLadderEmpty;
|
||||||
|
*
|
||||||
|
* Public: No
|
||||||
|
*/
|
||||||
|
#include "script_component.hpp"
|
||||||
|
|
||||||
|
params ["_ladder"];
|
||||||
|
|
||||||
|
private _unitsNearLadder = nearestObjects [_ladder, ["CAManBase"], 4];
|
||||||
|
TRACE_1("Near Ladder",_unitsNearLadder);
|
||||||
|
|
||||||
|
private _ladderEmpty = true;
|
||||||
|
{
|
||||||
|
if (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState _x >> "ACE_isLadder") == 1) exitWith {
|
||||||
|
_ladderEmpty = false;
|
||||||
|
TRACE_1("On Ladder",_x);
|
||||||
|
};
|
||||||
|
} forEach _unitsNearLadder;
|
||||||
|
|
||||||
|
_ladderEmpty
|
@ -42,7 +42,8 @@ GVAR(currentStep) = 3;
|
|||||||
GVAR(currentAngle) = 0;
|
GVAR(currentAngle) = 0;
|
||||||
|
|
||||||
// add mouse buttons and hints
|
// add mouse buttons and hints
|
||||||
[localize LSTRING(Deploy), localize LSTRING(Drop), localize LSTRING(Adjust)] call EFUNC(interaction,showMouseHint);
|
//private _adjustText = format ["%1, +%2", localize LSTRING(Adjust), localize LSTRING(AdjustTilt)]; // Tilting disabled due to sinking, interaction point offset and unsuitable animation
|
||||||
|
[localize LSTRING(Deploy), localize LSTRING(Drop), /*_adjustText*/ localize LSTRING(Adjust)] call EFUNC(interaction,showMouseHint);
|
||||||
|
|
||||||
_unit setVariable [QGVAR(Deploy), [
|
_unit setVariable [QGVAR(Deploy), [
|
||||||
_unit, "DefaultAction",
|
_unit, "DefaultAction",
|
||||||
|
@ -38,12 +38,20 @@
|
|||||||
<Portuguese>Derrubar escada</Portuguese>
|
<Portuguese>Derrubar escada</Portuguese>
|
||||||
</Key>
|
</Key>
|
||||||
<Key ID="STR_ACE_TacticalLadder_Adjust">
|
<Key ID="STR_ACE_TacticalLadder_Adjust">
|
||||||
<English>Extend, +Ctrl tilt</English>
|
<English>Extend</English>
|
||||||
<German>Ausfahren, +Strg kippen</German>
|
<German>Ausfahren</German>
|
||||||
<Polish>Rozłóż, +Ctrl nachyl</Polish>
|
<Polish>Rozłóż</Polish>
|
||||||
<Portuguese>Extender, +Ctrl tilt</Portuguese>
|
<Portuguese>Extender</Portuguese>
|
||||||
<Russian>Разложить, +Ctrl наклонить</Russian>
|
<Russian>Разложить</Russian>
|
||||||
<Czech>Prodloužit, +Ctrl naklonit</Czech>
|
<Czech>Prodloužit</Czech>
|
||||||
|
</Key>
|
||||||
|
<Key ID="STR_ACE_TacticalLadder_AdjustTilt">
|
||||||
|
<English>Ctrl tilt</English>
|
||||||
|
<German>Strg kippen</German>
|
||||||
|
<Polish>Ctrl nachyl</Polish>
|
||||||
|
<Portuguese>Ctrl tilt</Portuguese>
|
||||||
|
<Russian>Ctrl наклонить</Russian>
|
||||||
|
<Czech>Ctrl naklonit</Czech>
|
||||||
</Key>
|
</Key>
|
||||||
<Key ID="STR_ACE_TacticalLadder_Position">
|
<Key ID="STR_ACE_TacticalLadder_Position">
|
||||||
<English>Position ladder</English>
|
<English>Position ladder</English>
|
||||||
|
Loading…
Reference in New Issue
Block a user