Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

0.3.5.047

Browse Source
This commit is contained in:
vbawol 2015-11-22 17:01:46 -06:00
parent 73ceb4f50e
commit 91d1c623aa
11 changed files with 80 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Server_Install_Pack/sc/battleye/scripts.txt
View File

@ -49,7 +49,7 @@
7 setDamage !="player setdamage 1;"
7 setDammage
7 displaySetEventHandler
7 ctrlSetEventHandler !"BIS_fnc_guiMessage_status" !"ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\""
7 ctrlSetEventHandler !"BIS_fnc_guiMessage_status" !"ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\""
7 addMPEventHandler
7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !"FiredNear" !"EpeContactStart" !"InventoryClosed" !"GetOut" !"InventoryOpened" !"local" !"Respawn" !"Put" !"Take" !"Fired" !"Killed" !" [\"PostReset\",{BIS_EnginePPReset = true;} ];" !"_logic addeventhandler [\n\"local\""
7 displayAddEventHandler !"[_display] call _fnc_animate;" !"tVersion select 4) == \"Development\") then" !"_display displayaddeventhandler\n[\n\"mousemoving\"," !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !"(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"_this call EPOCH_KeyDown\"];" !="_addCase = _display46 displayAddEventHandler ['KeyDown',{_this call EPOCH_KeyDown;}];" !"_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'"
@ -61,7 +61,7 @@
7 displayRemoveEventHandler !"BIS_fnc_guiMessage_status"
7 switchCamera !="vehicle player switchCamera"
7 remoteControl !"fn_moduleRemoteControl.sqf" !="\"BIS_fnc_moduleRemoteControl"\"
7 drawIcon3D !="drawIcon3D[\"\x\addons\a3_epoch_code\Data\Member.paa\",_color,_pos,1,1,0,_text,1,0.025,\"PuristaMedium\"];\n}forEach EPOCH_ESP_TARGETS;" !"drawIcon3D[format[\"\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa\",_stability],_color,(getPosATL EPOCH_stabilityTarget),5,5,0,\"\",1,0.05,\"PuristaMedium\"];" !"drawIcon3D[format[\"\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa\",_num],_color,_pos,4,4,0,\"\",1,0.05,\"PuristaMedium\"];" !"EPOCH_drawIcon3dStability" !"EPOCH_drawIcon3d" !"if (_condition) then {\ndrawIcon3D [_icon, _color, _position, _sizeX, _sizeY, _angle, _text," !="drawIcon3D [\"\A3\UI_F_MP_Mark\Data\Tasks\Misc\background.paa\""
7 drawIcon3D !="drawIcon3D[\"\x\addons\a3_epoch_code\Data\Member.paa\",_color,_pos,1,1,0,_text,1,0.025,\"PuristaMedium\"];\n}forEach EPOCH_ESP_TARGETS;" !"drawIcon3D[format[\"\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa\",_stability],_color,(getPosATL EPOCH_stabilityTarget),5,5,0,\"\",1,0.05,\"PuristaMedium\"];" !"drawIcon3D[format[\"\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa\",_num],_color,_pos,4,4,0,\"\",1,0.05,\"PuristaMedium\"];" !"EPOCH_drawIcon3dStability" !"EPOCH_drawIcon3d" !"if (_condition) then {\ndrawIcon3D [_icon, _color, _position, _sizeX, _sizeY, _angle, _text," !="drawIcon3D [\"\A3\UI_F_MP_Mark\Data\Tasks\Misc\background.paa\"" !="drawIcon3D[\"x\addons\a3_epoch_code\Data\UI\snap_ca.paa\""
7 drawLine3D !"{\nfor [{_i = 1}, {_i < count _x}, {_i = _i + 1}] do {\ndrawLine3D [_x select (_i - 1), _x select _i, ((BIS_tracedShooter getVari"
7 ctrlCreate !="ctrlCreate [\"RscProgress\",_idc + 1];" !="ctrlCreate [\"rmx_rscControlsGroup\"" !="_ListGroup = _display ctrlCreate [\"RscControlsGroupNoHScrollbars\"" !="ctrlCreate [_x,call _getIDC];" !="_mainGrp = _display ctrlCreate [\"Epoch_main_config_group\",_value];" !="ctrlCreate [\"RscControlsGroupNoScrollbars\",call epoch_getIDC];" !="ctrlCreate [\"rmx_rscPicture\",(66600 + _e)];" !="ctrlCreate ["RscStructuredText",call epoch_getIDC];"
7 ctrlClassName

BIN
Sources/epoch_code/Data/UI/buttons/dm_selection_b1.paa Normal file
View File

Binary file not shown.

34
Sources/epoch_code/compile/EPOCH_onEachFrame.sqf
View File

@ -1,4 +1,3 @@
if (EPOCH_velTransform) then {
if (EPOCH_playerEnergy > 0) then {
_pos1 = getPosASL EPOCH_target;
@ -23,7 +22,6 @@ if (EPOCH_velTransform) then {
EPOCH_velTransform = false;
};
};
if (!isNull EPOCH_currentTarget && vehicle player == player) then {
_currentTarget = EPOCH_currentTarget;
@ -39,13 +37,20 @@ if (!isNull EPOCH_currentTarget && vehicle player == player) then {
switch _interactOption do {
case 0: {
_stability = 100 - round(damage _currentTarget * 10);
_stability = 100 - round(damage _currentTarget * 100);
_icon = "\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa";
_text = "Press (Inventory)";
if (_stability < 50) then {
_color = [1, 0.5, 0, 0.7];
if (_stability < 25) then {
_color = [1, 0, 0, 0.7];
};
};
};
case 1: {
_text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Enable Build - Press (%1)",EPOCH_keysBuildMode1 call BIS_fnc_keyCode] }];
_stability = _currentTarget getVariable["stability", 100];
_text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Press (%1)",EPOCH_keysBuildMode1 call BIS_fnc_keyCode] }];
_stability = if (EPOCH_buildMode > 0) then[{_currentTarget getVariable["stability", 100]}, {100 - round(damage _currentTarget * 100)}];
_icon = "\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa";
if (_stability < 50) then {
@ -58,7 +63,7 @@ if (!isNull EPOCH_currentTarget && vehicle player == player) then {
case 2: {
if (alive _currentTarget) then{
_text = format["%1 - Press (Ctrl+%2)", if (isStreamFriendlyUIEnabled) then[{"Player"}, { name _currentTarget }],EPOCH_keysAcceptTrade call BIS_fnc_keyCode];
_stability = 100 - round(damage _currentTarget * 10);
_stability = 100 - round(damage _currentTarget * 100);
_icon = "\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa";
if (_stability < 50) then{
@ -81,7 +86,8 @@ if (!isNull EPOCH_currentTarget && vehicle player == player) then {
};
case 4: {
//_text = if (EPOCH_buildMode > 0) then[{"Press (Space)"}, { "Press (Inventory)" }];
_stability = _currentTarget getVariable["stability", 100];
_text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Press (%1) or (Inventory)",EPOCH_keysBuildMode1 call BIS_fnc_keyCode] }];
_stability = if (EPOCH_buildMode > 0) then[{_currentTarget getVariable["stability", 100]}, {100 - round(damage _currentTarget * 100)}];
_icon = "\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa";
if (_stability < 50) then{
@ -120,7 +126,7 @@ if (!isNull EPOCH_currentTarget && vehicle player == player) then {
_pos = visiblePositionASL _currentTarget;
_pos set[2, (_currentTarget modelToWorld[0, 0, 0]) select 2];
_size = 3;
_size = 2.5;
drawIcon3D[format[_icon, _stability], _color, _pos, _size, _size, 0, _text, 0, _size / 60, "PuristaMedium"];
};
}
@ -128,6 +134,7 @@ else {
EPOCH_stabilityTarget = objNull;
};
if (EPOCH_drawIcon3d) then {
{
if (!isPlayer _x) then {
@ -146,6 +153,17 @@ if (EPOCH_drawIcon3d) then {
};
}forEach EPOCH_arr_countdown;
};
{
_distance = player distance _x;
if (_distance < 9) then {
_pos = _x;
_color = [1, 1, 1, 0.7];
_size = 1;
drawIcon3D["x\addons\a3_epoch_code\Data\UI\snap_ca.paa", _color, _pos, _size, _size, 0, "", 1, _size / 60, "PuristaMedium"];
};
}forEach EPOCH_arr_snapPoints;
{
if (!isNull _x) then {
_pos = visiblePositionASL _x;

35
Sources/epoch_code/compile/building/EPOCH_staticMove.sqf
View File

@ -73,6 +73,7 @@ if (_class != "") then {
_isSnap = false;
_EPOCH_1 = diag_tickTime;
_EPOCH_2 = diag_tickTime;
_nearestObjects = [];
while {EPOCH_target == _currentTarget} do {
@ -242,19 +243,29 @@ if (_class != "") then {
_currentTarget setVectorDirAndUp[_dir2, (vectorUp _nearestObject)];
_currentTarget setposATL _snapPosition;
{
_pos1_snap = _currentTarget modelToWorldVisual (_x select 0);
_pos2_snap = _currentTarget modelToWorldVisual (_x select 1);
_ins = lineIntersectsSurfaces [AGLToASL _pos1_snap, AGLToASL _pos2_snap,player,_currentTarget,true,1,"VIEW","FIRE"];
if (count _ins > 0) then {
[ASLToATL (_ins select 0 select 0),1,"x\addons\a3_epoch_code\Data\UI\snap_ca.paa", "",20] call epoch_gui3dWorldPos;
};
} forEach _snapChecks;
if ((diag_tickTime - _EPOCH_2) > 2) then {
_EPOCH_2 = diag_tickTime;
EPOCH_arr_snapPoints = [];
{
_pos1_snap = _currentTarget modelToWorldVisual (_x select 0);
_pos2_snap = _currentTarget modelToWorldVisual (_x select 1);
_ins = lineIntersectsSurfaces [AGLToASL _pos1_snap, AGLToASL _pos2_snap,player,_currentTarget,true,1,"VIEW","FIRE"];
if (count _ins > 0) then {
if (surfaceIsWater _snapPosition) then {
EPOCH_arr_snapPoints pushBack (_ins select 0 select 0);
} else {
EPOCH_arr_snapPoints pushBack ASLToATL(_ins select 0 select 0);
};
};
if (count EPOCH_arr_snapPoints >= 2) exitWith {}
} forEach _snapChecks;
};
};
} else {
EPOCH_arr_snapPoints = [];
if !(attachedObjects player isEqualTo[]) then {
_offSet = [EPOCH_X_OFFSET, EPOCH_Y_OFFSET, EPOCH_Z_OFFSET];
_pos1 = player modelToWorldVisual _offSet;
@ -272,12 +283,16 @@ if (_class != "") then {
if ((diag_tickTime - _EPOCH_1) > 1) then {
_EPOCH_1 = diag_tickTime;
_nearestObjects = nearestObjects[EPOCH_target, _allowedSnapObjects, 12];
EPOCH_playerEnergy = (EPOCH_playerEnergy - _energyCost) max 0;
if !(isNull EPOCH_target) then {
_nearestObjects = nearestObjects[EPOCH_target, _allowedSnapObjects, 12];
EPOCH_playerEnergy = (EPOCH_playerEnergy - _energyCost) max 0;
};
};
};
EPOCH_arr_snapPoints = [];
{
detach _x;
} forEach attachedObjects player;

3
Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf
View File

@ -61,6 +61,7 @@ if (_dikCode == EPOCH_keysDebugMon) then {
//Action Menu
if (_dikCode == EPOCH_keysAction) then {
_handled = true;
if !(EPOCH_keysActionPressed) then {
EPOCH_keysActionPressed = true;
if (cursorTarget isKindOf "AllVehicles") then {
@ -76,7 +77,7 @@ if (_dikCode == EPOCH_keysAction) then {
// Player only code
if (vehicle player == player) then {
if (_dikCode == EPOCH_keysBuildMode1) then {
if (EPOCH_buildMode == 1) then {
EPOCH_buildMode = 0;

8
Sources/epoch_code/compile/inventory/EPOCH_initUI.sqf
View File

@ -2,11 +2,6 @@ private ["_bar","_uniformArmor","_totalArmor","_finalArmor","_vestArmor","_headg
disableSerialization;
EPOCH_InteractedItem = [];
if (isNil "EPOCH_MAX_ARMOR") then {
call EPOCH_maxArmorInit;
};
EPOCH_lastContainer = _this select 1;
waitUntil {!isNull findDisplay 602};
@ -14,9 +9,6 @@ _display = (findDisplay 602);
(_display displayCtrl -13) ctrlEnable false;
_totalArmor = 0;
_totalArmorMax = EPOCH_MAX_ARMOR select 3;
_color = [0.6,0.6,0.6,1];
_colorCompare = [0.4,0.6,1,0.4];

4
Sources/epoch_code/compile/inventory/EPOCH_refeshUI.sqf
View File

@ -7,6 +7,10 @@ if (!isNull findDisplay 602) then {
_selectedClass = EPOCH_InteractedItem select 1;
};
if (isNil "EPOCH_MAX_ARMOR") then {
call EPOCH_maxArmorInit;
};
_totalArmor = 0;
_totalArmorMax = EPOCH_MAX_ARMOR select 3;

10
Sources/epoch_code/gui/scripts/dynamenu/Epoch_dynamicMenuPopulate.sqf
View File

@ -40,7 +40,7 @@ for "_p" from 0 to 360 step _points do {
_x = cos _p * (0.3 * _distance);
_y = sin _p * (0.4 * _distance);
_positions pushBack [_x + (_center - (_scaleLargeX / 2)),_y + (_center - (_scaleLargeY / 2)),_scaleLargeX,_scaleLargeY];
_positions2 pushBack [_x + (_center - (_scaleSmallX / 2)),_y + (_center - (_scaleSmallY / 2)),_scaleSmallX,_scaleSmallY];
};
@ -50,19 +50,19 @@ missionNamespace setVariable ["rmx_var_dynaControls",[]];
for "_e" from 0 to (_entries - 1) do {
private ["_ctrl","_ctrl2"];
_ctrl = _display ctrlCreate ["rmx_rscPicture",(66600 + _e)];
_ctrl ctrlSetText "x\addons\a3_epoch_code\Data\UI\buttons\dm_selection.paa";
_ctrl ctrlSetText "x\addons\a3_epoch_code\Data\UI\buttons\dm_selection_b1.paa";
_ctrl ctrlSetPosition (_positions select _e);
_ctrl ctrlSetFade 1;
_ctrl ctrlCommit 0;
_ctrl ctrlSetTooltip (_buttonSettings select _e select 1);
_ctrl ctrlSetTooltipColorBox [0, 0, 0, 0];
_ctrl ctrlSetTooltipColorShade [0, 0, 0, 0];
_ctrl ctrlSetEventHandler ["mouseEnter", "_c = _this select 0; _c ctrlSetFade 0; [_c,0.85,0.1] call BIS_fnc_ctrlSetScale"];
_ctrl ctrlSetEventHandler ["mouseExit", "_c = _this select 0; _c ctrlSetFade 1; [_c,1,0.1] call BIS_fnc_ctrlSetScale"];
_ctrl ctrlSetEventHandler ["mouseButtonDown", (_buttonSettings select _e select 2)];
_ctrl ctrlEnable true;
_ctrl2 = _display ctrlCreate ["rmx_rscPicture",-(66600 + _e)];
_ctrl2 ctrlSetTooltip (_buttonSettings select _e select 1);
_ctrl2 ctrlSetTooltipColorBox [0, 0, 0, 0];
@ -70,7 +70,7 @@ for "_e" from 0 to (_entries - 1) do {
_ctrl2 ctrlSetText (_buttonSettings select _e select 0);
_ctrl2 ctrlSetPosition (_positions2 select _e);
_ctrl2 ctrlCommit 0.1;
_arr = missionNamespace getVariable ["rmx_var_dynaControls",[]];
_arr append [_ctrl,_ctrl2];
missionNamespace setVariable ["rmx_var_dynaControls",_arr];

4
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
View File

@ -15,7 +15,7 @@ class veh_unLock
class player_inspect
{
condition = "true";
action = "hint 'Detective is on the case'";
action = "call EPOCH_lootTrash;";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\player_inspect.paa";
tooltip = "Examine";
};
};

8
Sources/epoch_config/Configs/CfgBaseBuilding.hpp
View File

@ -20,6 +20,14 @@ class CfgBaseBuilding {
{
removeParts[] = { { "PartPlankPack", 4 } };
};
class Hesco3_EPOCH : Default
{
removeParts[] = { { "KitHesco3", 1 } };
};
class TankTrap_EPOCH : Default
{
removeParts[] = { { "KitTankTrap", 1 } };
};
class SolarGen_EPOCH : Default
{
removeParts[] = { { "KitSolarGen", 1 } };

9
Sources/epoch_config/Configs/CfgSnapChecks.hpp
View File

@ -2,14 +2,16 @@
class CfgSnapChecks {
class Hesco3_EPOCH {
nails[] = {
{{0,0,-0.6},{0,0,-0.75}},
{{1.6,0,-0.6},{1.6,0,-0.75}},
{{-1.6,0,-0.6},{-1.6,0,-0.75}},
{{1.6,0,-0.0307557},{1.8625,0,-0.0307557}},
{{-1.6,0,-0.0307557},{-1.8625,0,-0.0307557}}
};
};
class WoodLargeWall_EPOCH {
nails[] = {
{{0,0,0.120775},{0,0,-0.190775}},
{{2.46932,0,0.120775},{2.46932,0,-0.190775}},
{{-2.46932,0,0.120775},{-2.46932,0,-0.190775}},
{{2.46932,0,1.5},{2.76932,0,1.5}},
{{-2.46932,0,1.5},{-2.76932,0,1.5}}
};
@ -41,7 +43,8 @@ class CfgSnapChecks {
class MetalFloor_EPOCH : WoodFloor_Epoch {};
class WoodStairs_EPOCH {
nails[] = {
{{0,0,0.05},{0,0,-0.20}}
{{0.1,0,0.05},{0.1,0,-0.20}},
{{-0.1,0,0.05},{-0.1,0,-0.20}}
};
};
class WoodStairs2_EPOCH : WoodStairs_EPOCH {};