diff --git a/README.md b/README.md index cd6c66e..174470e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![ArmA 1.74](https://img.shields.io/badge/ArmA%203-1.74-blue.svg) ![Exile 1.0.3+](https://img.shields.io/badge/Exile-1.0.3+%20Kohlrabi-yellowgreen.svg) ![Build Status](https://img.shields.io/badge/Custom%20Build-passing-38AA38.svg) +![ArmA 1.80+](https://img.shields.io/badge/ArmA%203-1.80+-blue.svg) ![Exile 1.0.4+](https://img.shields.io/badge/Exile-1.0.4+%20Pineapple-yellowgreen.svg) ![Build Status](https://img.shields.io/badge/Custom%20Build-passing-38AA38.svg) # To the User: ####NEW Disclaimer: diff --git a/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_beginNewObject.sqf b/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_beginNewObject.sqf index d6509e4..be11b47 100644 --- a/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_beginNewObject.sqf +++ b/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_beginNewObject.sqf @@ -41,8 +41,7 @@ else ExileClientConstructionIsInSelectSnapObjectMode = true; ExileClientConstructionSupportSnapMode = count(ExileClientConstructionSnapToObjectClassNames) > 0; ExileClientConstructionCurrentSnapToObject = objNull; - ExileClientConstructionPosition = [getPosATL player, ExileClientConstructionOffset select 1, getDir player] call ExileClient_util_math_getPositionInDirection; - ExileClientConstructionPosition set[2, ExileClientConstructionOffset select 2]; + ExileClientConstructionPosition = ASLtoATL ([getPosASL player, 5, getDir player] call ExileClient_util_math_getPositionInDirection); { player reveal _x; } @@ -53,7 +52,7 @@ else } else { - ["buildTerritoryRequest", [_previewObjectClassName, (ASLtoAGL (ATLtoASL ExileClientConstructionPosition)),_this select 1,_this select 2]] call ExileClient_system_network_send; + ["buildTerritoryRequest", [_previewObjectClassName,ExileClientConstructionPosition,_this select 1,_this select 2]] call ExileClient_system_network_send; }; }; true \ No newline at end of file diff --git a/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_thread.sqf b/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_thread.sqf index 977f096..78d25b4 100644 --- a/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_thread.sqf +++ b/eXile.MAPNAME/eXpochVectorBldg/ExileClient_construction_thread.sqf @@ -228,7 +228,7 @@ while {ExileClientConstructionResult isEqualTo 0} do _objectColor = "#(argb,2,2,1)color(0.91,0,0,0.6,ca)"; }; }; - if !(([configName ExileClientConstructionConfig, ASLtoAGL (getPosASL ExileClientConstructionObject), getPlayerUID player] call ExileClient_util_world_canBuildHere) isEqualTo 0) then + if !(([configName ExileClientConstructionConfig, getPosASL ExileClientConstructionObject, getPlayerUID player] call ExileClient_util_world_canBuildHere) isEqualTo 0) then { ExileClientConstructionCanPlaceObject = false; _simulatePhysics = false; diff --git a/eXile.MAPNAME/eXpochVectorBldg/ExileClient_gui_hud_event_onKeyUp.sqf b/eXile.MAPNAME/eXpochVectorBldg/ExileClient_gui_hud_event_onKeyUp.sqf index c2ac01b..748ef67 100644 --- a/eXile.MAPNAME/eXpochVectorBldg/ExileClient_gui_hud_event_onKeyUp.sqf +++ b/eXile.MAPNAME/eXpochVectorBldg/ExileClient_gui_hud_event_onKeyUp.sqf @@ -208,30 +208,40 @@ switch (_keyCode) do }; case 0x07: { - if (ExileClientIsInConstructionMode) then + if (getText(missionConfigFile >> "Header" >> "gameType") isEqualTo "Escape") then { - if(ExileClientConstructionLock)then + if (alive player) then { - ExileClientConstructionLock = false; - _posObject = position ExileClientConstructionObject; - ExileClientConstructionOffset = player worldToModel _posObject; - ExileClientConstructionRotation = (getDir ExileClientConstructionObject) - (getDir player); - } - else - { - ExileClientConstructionLock = true; + [] call ExileClient_gui_hud_toggleEscapeStats; }; } else { - if (!ExileClientXM8IsVisible) then + if (ExileClientIsInConstructionMode) then { - if ("Exile_Item_XM8" in (assignedItems player)) then + if(ExileClientConstructionLock)then { - if (alive player) then + ExileClientConstructionLock = false; + _posObject = position ExileClientConstructionObject; + ExileClientConstructionOffset = player worldToModel _posObject; + ExileClientConstructionRotation = (getDir ExileClientConstructionObject) - (getDir player); + } + else + { + ExileClientConstructionLock = true; + }; + } + else + { + if (!ExileClientXM8IsVisible) then + { + if ("Exile_Item_XM8" in (assignedItems player)) then { - [] call ExileClient_gui_xm8_show; - }; + if (alive player) then + { + [] call ExileClient_gui_xm8_show; + }; + }; }; }; };