Permalink
Browse files

Merge pull request #661 from EpochModTeam/experimental

0.4 b655
  • Loading branch information...
2 parents f2d809a + f972e6a commit ed29f4486d0a1850261111d4b4f10aca272cbee8 @vbawol vbawol committed on GitHub Nov 14, 2016
Showing with 350 additions and 54,245 deletions.
  1. +1 −1 README.md
  2. BIN Server_Install_Pack/@epochhive/addons/epoch_server.pbo
  3. BIN Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
  4. BIN Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
  5. +2 −0 Server_Install_Pack/@epochhive/epochah.hpp
  6. BIN Server_Install_Pack/@epochhive/epochserver.so
  7. +1 −1 Server_Install_Pack/README.txt
  8. BIN Server_Install_Pack/mpmissions/epoch.Altis.pbo
  9. BIN Server_Install_Pack/mpmissions/epoch.Australia.pbo
  10. BIN Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
  11. BIN Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
  12. BIN Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
  13. BIN Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
  14. BIN Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
  15. BIN Server_Install_Pack/mpmissions/epoch.Esseker.pbo
  16. BIN Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
  17. BIN Server_Install_Pack/mpmissions/epoch.Napf.pbo
  18. BIN Server_Install_Pack/mpmissions/epoch.Porto.pbo
  19. BIN Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
  20. BIN Server_Install_Pack/mpmissions/epoch.Sara.pbo
  21. BIN Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
  22. BIN Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
  23. BIN Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
  24. BIN Server_Install_Pack/mpmissions/epoch.Stratis.pbo
  25. BIN Server_Install_Pack/mpmissions/epoch.Takistan.pbo
  26. BIN Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
  27. BIN Server_Install_Pack/mpmissions/epoch.VR.pbo
  28. BIN Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
  29. BIN Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
  30. BIN Server_Install_Pack/mpmissions/epoch.utes.pbo
  31. BIN Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo
  32. +1 −1 Server_Install_Pack/sc/BattlEye/addweaponcargo.txt
  33. +2 −2 Server_Install_Pack/sc/BattlEye/scripts.txt
  34. +10 −20 Sources/epoch_code/System/player_login.fsm
  35. +1 −1 Sources/epoch_code/compile/EPOCH_makeMarker.sqf
  36. +3 −3 Sources/epoch_code/compile/EPOCH_onEachFrame.sqf
  37. +1 −1 Sources/epoch_code/compile/EPOCH_unitSpawn.sqf
  38. +2 −9 Sources/epoch_code/compile/building/EPOCH_changeWallState.sqf
  39. +73 −50 Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf
  40. +6 −51 Sources/epoch_code/compile/interface_event_handlers/EPOCH_KeyDown.sqf
  41. +3 −3 Sources/epoch_code/compile/setup/EPOCH_clientKeyMap.sqf
  42. +1 −2 Sources/epoch_code/compile/setup/masterLoop/Event1.sqf
  43. +1 −1 Sources/epoch_code/compile/setup/masterLoop/Event7.sqf
  44. +10 −20 Sources/epoch_code/compile/setup/masterLoop/init.sqf
  45. +62 −0 Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHeartbeat.sqf
  46. +61 −0 Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlShake.sqf
  47. +2 −2 Sources/epoch_code/gui/scripts/dynamicHUD/epoch_dynamicHUD_start.sqf
  48. +1 −1 Sources/epoch_code/gui/scripts/messaging/Epoch_message.sqf
  49. +1 −1 Sources/epoch_code/gui/scripts/messaging/Epoch_message_old1.sqf
  50. +1 −1 Sources/epoch_code/gui/scripts/messaging/Epoch_message_old2.sqf
  51. +1 −1 Sources/epoch_code/gui/scripts/post_process/EPOCH_postprocessAdjust.sqf
  52. +1 −1 Sources/epoch_code/gui/scripts/post_process/EPOCH_postprocessCreate.sqf
  53. +1 −1 Sources/epoch_code/gui/scripts/post_process/EPOCH_postprocessDestroy.sqf
  54. +1 −1 Sources/epoch_code/gui/scripts/post_process/Epoch_setDrunk.sqf
  55. +1 −1 Sources/epoch_code/gui/scripts/post_process/Epoch_setRadiation.sqf
  56. +1 −1 Sources/epoch_code/gui/scripts/worldToScreen/Epoch_gui3DModelPos.sqf
  57. +1 −1 Sources/epoch_code/init/both_init.sqf
  58. +51 −0 Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
  59. +0 −1,370 Sources/epoch_config/Configs/CfgBaseBuilding.json
  60. +0 −43,072 Sources/epoch_config/Configs/CfgBuildingLootPos.json
  61. +6 −0 Sources/epoch_config/Configs/CfgClientFunctions.hpp
  62. +0 −260 Sources/epoch_config/Configs/CfgClientFunctions.json
  63. +1 −1 Sources/epoch_config/Configs/CfgDynamicHUD.hpp
  64. +0 −39 Sources/epoch_config/Configs/CfgDynamicHUD.json
  65. +17 −14 Sources/epoch_config/Configs/CfgEpochClient.hpp
  66. +0 −601 Sources/epoch_config/Configs/CfgEpochClient.json
  67. +0 −44 Sources/epoch_config/Configs/CfgEpochConfiguration.json
  68. +0 −1,302 Sources/epoch_config/Configs/CfgItemInteractions.json
  69. +0 −39 Sources/epoch_config/Configs/CfgMasterLoop.json
  70. +0 −603 Sources/epoch_config/Configs/CfgObjectInteractions.json
  71. +0 −3,308 Sources/epoch_config/Configs/CfgPricing.json
  72. +0 −226 Sources/epoch_config/Configs/CfgRemoteExec.json
  73. +0 −59 Sources/epoch_config/Configs/CfgSay3Dhandler.json
  74. +0 −288 Sources/epoch_config/Configs/CfgSnapChecks.json
  75. +0 −23 Sources/epoch_config/Configs/CfgSwitchMovehandler.json
  76. +0 −2,805 Sources/epoch_config/Configs/cfgCrafting.json
  77. +1 −1 Sources/epoch_config/build.hpp
  78. +1 −1 Sources/epoch_server/build.hpp
  79. +1 −1 Sources/epoch_server/compile/epoch_server/EPOCH_weightedArray.sqf
  80. +5 −3 Sources/epoch_server/compile/epoch_trading/EPOCH_server_takeCrypto.sqf
  81. +11 −4 Sources/epoch_server/init/server_securityfunctions.sqf
  82. BIN Sources/epoch_server/treeView.txt
  83. +1 −1 Sources/epoch_server_core/build.hpp
  84. BIN Sources/epoch_server_core/treeView.txt
  85. +1 −1 Sources/epoch_server_settings/build.hpp
  86. BIN Sources/epoch_server_settings/treeView.txt
  87. BIN Sources/mpmissions/epoch.Altis/treeView.txt
  88. BIN Sources/mpmissions/epoch.Australia/treeView.txt
  89. BIN Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt
  90. BIN Sources/mpmissions/epoch.Bornholm/treeView.txt
  91. BIN Sources/mpmissions/epoch.Chernarus/treeView.txt
  92. BIN Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt
  93. BIN Sources/mpmissions/epoch.Desert_E/treeView.txt
  94. BIN Sources/mpmissions/epoch.Esseker/treeView.txt
  95. BIN Sources/mpmissions/epoch.Mountains_ACR/treeView.txt
  96. BIN Sources/mpmissions/epoch.Napf/treeView.txt
  97. BIN Sources/mpmissions/epoch.Porto/treeView.txt
  98. BIN Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt
  99. BIN Sources/mpmissions/epoch.Sara/treeView.txt
  100. BIN Sources/mpmissions/epoch.SaraLite/treeView.txt
  101. BIN Sources/mpmissions/epoch.Sara_dbe1/treeView.txt
  102. BIN Sources/mpmissions/epoch.Shapur_BAF/treeView.txt
  103. BIN Sources/mpmissions/epoch.Stratis/treeView.txt
  104. BIN Sources/mpmissions/epoch.Takistan/treeView.txt
  105. BIN Sources/mpmissions/epoch.Tanoa/treeView.txt
  106. BIN Sources/mpmissions/epoch.VR/treeView.txt
  107. BIN Sources/mpmissions/epoch.Woodland_ACR/treeView.txt
  108. BIN Sources/mpmissions/epoch.Zargabad/treeView.txt
  109. BIN Sources/mpmissions/epoch.utes/treeView.txt
  110. BIN Sources/mpmissions/epoch_RyanZed.Tanoa/treeView.txt
  111. +1 −1 build.txt
View
@@ -15,4 +15,4 @@ http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Credits:
=====
-https://github.com/EpochModTeam/Epoch/blob/master/CREDITS.md
+https://github.com/EpochModTeam/Epoch/blob/release/CREDITS.md
Binary file not shown.
@@ -1,5 +1,7 @@
// Anti Hack
antihack_Enabled = true; // built-in Anti-Hack
+antihack_maxTravelDistance = 30; // anti-teleport max travel distance
+antihack_TPcenterDistance = 30; // anti-teleport distance from start
antihack_cfgPatchesCheck = true; // cfgPatches (AddOn Check)
antihack_PVSPrefix = "EPAH_"; // used to help whitelist pveh variables in BE without BEC and watchdog, leave blank to use no prefix.
antihack_cfgPatchesMode[] = {2}; // 0 == BAN - 1 = LOG, 2 = KICK
Binary file not shown.
@@ -15,4 +15,4 @@ http://www.bistudio.com/community/licenses/arma-public-license-share-alike
Credits:
=====
-https://github.com/EpochModTeam/Epoch/blob/master/CREDITS.md
+https://github.com/EpochModTeam/Epoch/blob/release/CREDITS.md
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
-5 "" !="(V|H)_(F|)[0-9]{1,3}_EPOCH" !="Item(Map|GPS|Compass|Watch)" !="EpochRadio[0-9]" !="B_UavTerminal" !="(U|G|bipod|acc|muzzle|optic)_[0-9A-Z_]{1,100}" !="(NVG|Defib|Heal|Repair|Elcan(_reflex|))_EPOCH" !="(Binocular|Rangefinder|Hatchet|CrudeHatchet|WoodClub|Melee(Sledge|Maul|Rod|Sword)|ChainSaw|MultiGun|Rollins_F|Plunger)" !="(ruger_pistol|speargun|1911_pistol|akm|m14|M14Grn|m16|m16Red|m107|m107Tan|m249|m249Tan|m4a3|sr25|l85a2|l85a2_(pink|ugl))_epoch" !="SMG_(01|02)_F" !="hgun_(PDW2000|ACPC2|Rook40|P07|Pistol_heavy_0[1-2]|Pistol_Signal)_F" !="LMG_(Mk200|Zafir)_F" !="srifle_(EBR|GM6|LRR|DMR_01)_(camo_|)F" !="arifle_(Katiba|Katiba_C|Katiba_GL|SDAR|TRG21|TRG20|TRG21_GL|Mk20|Mk20C|Mk20C_plain|Mk20_GL|Mk20_plain|Mk20_GL_plain)_F" !="arifle_(MXC|MX|MX_GL|MXM|MXM_Black|MX_GL_Black|MX_Black|MXC_Black|MX_SW|MX_SW_Black)_F" !="srifle_DMR_0[2-6](_(camo|sniper|khaki|tan|multicam|woodland|spotter|blk|hex|olive)_|_)F" !="MMG_0[1-2]_(hex|tan|camo|black|sand)_F" !"CUP_((h|s)gun|(s|a)rifle|(l|s)mg)_"
+5 "" !="(V|H)_(F|)[0-9]{1,3}_EPOCH" !="(clown|pkin|wolf)_mask_epoch" !="Item(Map|GPS|Compass|Watch)" !="EpochRadio[0-9]" !="B_UavTerminal" !="(U|G|bipod|acc|muzzle|optic)_[0-9A-Z_]{1,100}" !="(NVG|Defib|Heal|Repair|Elcan(_reflex|))_EPOCH" !="(Binocular|Rangefinder|Hatchet|CrudeHatchet|WoodClub|Melee(Sledge|Maul|Rod|Sword)|ChainSaw|MultiGun|Rollins_F|Plunger)" !="(ruger_pistol|speargun|1911_pistol|akm|m14|M14Grn|m16|m16Red|m107|m107Tan|m249|m249Tan|m4a3|sr25|l85a2|l85a2_(pink|ugl))_epoch" !="SMG_(01|02)_F" !="hgun_(PDW2000|ACPC2|Rook40|P07|Pistol_heavy_0[1-2]|Pistol_Signal)_F" !="LMG_(Mk200|Zafir)_F" !="srifle_(EBR|GM6|LRR|DMR_01)_(camo_|)F" !="arifle_(Katiba|Katiba_C|Katiba_GL|SDAR|TRG21|TRG20|TRG21_GL|Mk20|Mk20C|Mk20C_plain|Mk20_GL|Mk20_plain|Mk20_GL_plain)_F" !="arifle_(MXC|MX|MX_GL|MXM|MXM_Black|MX_GL_Black|MX_Black|MXC_Black|MX_SW|MX_SW_Black)_F" !="srifle_DMR_0[2-6](_(camo|sniper|khaki|tan|multicam|woodland|spotter|blk|hex|olive)_|_)F" !="MMG_0[1-2]_(hex|tan|camo|black|sand)_F" !"CUP_((h|s)gun|(s|a)rifle|(l|s)mg)_"
@@ -47,7 +47,7 @@
7 displaySetEventHandler
7 ctrlSetEventHandler !="_ctrlButtonOK ctrlseteventhandler [\"buttonclick\"," !="ctrlSetEventHandler ['LBDblClick', '_this call" !="_buttonRespawn ctrlseteventhandler [\"buttonclick\",\"with uinamespace do {['buttonRespawn'," !="_ctrl ctrlSetEventHandler [\"mouseEnter\"" !="_ctrlBtn ctrlSetEventHandler [\"MouseButtonDblClick\", _verAct];" !="_button_gen ctrlSetEventHandler [\"ButtonClick\",_btn_code + \"(uiNamespace getVariable [\""
7 addMPEventHandler
-7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !="player addeventhandler [\"PostReset\",{BIS_EnginePPReset = true;} ];" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler" !="_ship addEventHandler [\"AttributesChanged3DEN\"" !="addEventHandler [\"HandleDamage\",bis_fnc_reviveOnPlayerHandleDamage];" !="_unit addEventHandler [\"FiredNear\", \"sapperHndl setFSMVariable" !="_smokeEH = _plyr addEventHandler [\"FiredNear\", \"airDropHandle setFSMVariable" !="_onContactEH = _currentTarget addEventHandler[\"EpeContactStart""
+7 addEventHandler !"displayAddEventHandler" !"ctrlAddEventHandler" !="player addeventhandler [\"PostReset\",{BIS_EnginePPReset = true;} ];" !="player addEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="\"CBA_fnc_addEventHandler\"" !="\\fnc_addEventHandler" !="\"addEventHandler" !="_eventFunc = _eventFunc + \"(_this select 0) addEventHandler ['Respawn', \" + str _eventFunc + \"];\";" !="_unit addEventHandler [\"hitpart\"," !="CBA_fnc_addEventHandler" !="_ship addEventHandler [\"AttributesChanged3DEN\"" !="addEventHandler [\"HandleDamage\",bis_fnc_reviveOnPlayerHandleDamage];" !="_unit addEventHandler [\"FiredNear\"" !="_smokeEH = _plyr addEventHandler [\"FiredNear\", \"airDropHandle setFSMVariable" !="_onContactEH = _currentTarget addEventHandler[\"EpeContactStart""
7 displayAddEventHandler !="(findDisplay 46) displayAddEventHandler [\"KeyDown\",\"true\"];" !="displayAddEventHandler [_x,([\"CfgEpochClient\", _x, \"\"] call EPOCH_fnc_returnConfigEntryV2)];" !="_display displayaddeventhandler\n[\n\"mousemoving\"," !="_display displayaddeventhandler [\"unload\",\"uinamespace setvariable ['BIS_fnc_guiMess" !="findDisplay -1337 displayAddEventHandler ['Unload'" !="_display displayaddeventhandler [\"keydown\",\"with uinamespace do {['keyDown'" !="_display displayaddeventhandler [_x,_fnc_animate];" !="Development\") then\n{\n_display displayaddeventhandler [\n\"keydown\"" !="CBA_fnc_addDisplayHandler" !="_display displayAddEventHandler [\"MouseMoving" !="private _handler = _display displayAddEventHandler [_key, _code];"
7 ctrlAddEventHandler !="_ctrlMap = _display displayctrl 101;\n_ctrlMap ctrladdeventhandler" !="_display displayctrl 21995;\n_assetsButton ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2406; \n_control ctrladdeventhandler [\"buttonclick\"," !="_display displayctrl 2400;\n_control ctrladdeventhandler [\"buttonclick\"," !="_ctrlTags ctrladdeventhandler [\"lbselchanged\"," !="_ButtonGeneral ctrladdeventhandler [\"buttonclick\"," !="_ctrlExecuteLocal ctrladdeventhandler [\"buttonclick\"," !="_bg ctrlAddEventHandler [\"MouseEnter\"," !="_container ctrlAddEventHandler [\"LBDblClick\",\"_this call EPOCH_itemInteractClick\"];" !="(uiNamespace getVariable 'ESP_map') ctrlAddEventHandler['Draw', '_esp_targets = EPOCH_ESPMAP_TARGETS;" !="ctrlAddEventHandler ['MouseButtonDown'" !="(_display displayctrl _idc) ctrlAddEventHandler [\"LBSelChanged\"," !="_ctrl ctrlSetEventHandler [\"mouseEnter\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseExit\", (format [\"_c = _this select 0;" !="_ctrl ctrlSetEventHandler [\"mouseButtonDown\", (format [\"call %1;\",(_buttonSettings select _e select 2)])];" !="_prevButton ctrlAddEventHandler [\"MouseButtonUp\", {_this call cba_diagnostic_fnc_debug" !="BIS_RscRespawnControlsMap_ctrlHeaderRespawnButton ctrlAddEventhandler [\"ButtonDown\"" !="_control = _display displayctrl 105;\n_control ctrladdeventhandler [\"MouseButtonUp\""
7 removeAllEventHandlers !"ctrlRemoveAllEventHandlers" !"displayRemoveAllEventHandlers" !="_vehicle removeAllEventHandlers \"GetOut\";" !="_sapper removeAllEventHandlers \"Hit\";\n_sapper removeAllEventHandlers \"FiredNear\";" !="_unit removeAllEventHandlers \"Hit\";\n_unit removeAllEventHandlers \"FiredNear\";" !="{_ship removeAllEventHandlers _x;} forEach [\"AttributesChanged3DEN\"" !="_zombie removeAllEventHandlers \"Hit\";" !="_zombie removeAllEventHandlers \"FiredNear\";"
@@ -59,7 +59,7 @@
7 remoteControl !="fn_moduleRemoteControl.sqf" !="\"BIS_fnc_moduleRemoteControl\""
7 drawIcon3D !="EPOCH_drawIcon3dStability" !="EPOCH_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\"];" !="if (_condition) then {\ndrawIcon3D [_icon, _color, _position, _sizeX, _sizeY, _angle, _text," !="drawIcon3D [\"\A3\UI_F_MP_Mark\Data\Tasks\Misc\background.paa\"" !="drawIcon3D\n[\n(_x getVariable [\"bis_fnc_reviveGet3dIcons_textures" !="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 !="_parent ctrlcreate [\"RscMessageBox\",2351];" !="_c = _dsp ctrlCreate [\"rmx_drag_RscActivePicture\", call epoch_getIDC];" !="_c = _dsp ctrlCreate [\"rmx_t1\", call epoch_getIDC];" !="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];" !="_bar = _display ctrlCreate [\"RscCustomProgress\"" !="_group = _dsp ctrlCreate [\"rscControlsGroup\", call Epoch_getIDC]" !="_control = _display ctrlCreate [\"RscControlsGroupNoScrollbars\", 5678910];"
+7 ctrlCreate !="_parent ctrlcreate [\"RscMessageBox\",2351];" !="_c = _dsp ctrlCreate [\"rmx_drag_RscActivePicture\", call epoch_getIDC];" !="_c = _dsp ctrlCreate [\"rmx_t1\", call epoch_getIDC];" !="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];" !="_bar = _display ctrlCreate [\"RscCustomProgress\"" !="_group = _dsp ctrlCreate [\"rmx_rscControlsGroup\", call Epoch_getIDC]" !="_control = _display ctrlCreate [\"RscControlsGroupNoScrollbars\", 5678910];"
7 ctrlClassName
7 ctrlModel
7 ctrlModelDirection
@@ -2,7 +2,7 @@
/*%FSM<HEAD>*/
/*
item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"};
-item1[] = {"FINISH",1,4346,-149.463196,1518.792480,-49.463196,1568.792480,0.000000,"FINISH"};
+item1[] = {"FINISH",1,250,-149.463196,1518.792480,-49.463196,1568.792480,0.000000,"FINISH"};
item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"};
item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"};
item4[] = {"Player_Object_Re",4,218,-150.000000,75.000000,-50.000000,125.000000,0.000000,"Player" \n "Object Ready"};
@@ -25,7 +25,7 @@ item20[] = {"ERROR_Server_not",2,250,275.000000,875.000000,375.000000,925.000000
item21[] = {"",7,210,471.000000,895.999939,479.000000,904.000061,0.000000,""};
item22[] = {"Timeout_No_Respo",4,218,125.000000,775.000000,225.000000,825.000000,0.000000,"Timeout" \n "No Response"};
item23[] = {"Wrong_Server_Ver",4,218,125.000000,475.000000,225.000000,525.000000,10.000000,"Wrong" \n "Server Version"};
-item24[] = {"true",8,218,-150.000000,1125.000000,-50.000000,1175.000000,0.000000,"true"};
+item24[] = {"Player_In_Game",8,4314,-150.000000,1125.000000,-50.000000,1175.000000,0.000000,"Player" \n "In Game"};
item25[] = {"ERROR_Wrong_Server",2,250,275.000000,475.000000,375.000000,525.000000,0.000000,"ERROR" \n "Wrong" \n "Server Version"};
item26[] = {"Display_Message",4,218,600.000000,1150.000000,700.000000,1200.000000,0.000000,"" \n "Display Message" \n "Wait..."};
item27[] = {"Setup_Player_Obj",2,250,-25.000000,975.000000,75.000000,1025.000000,0.000000,"Setup Player" \n "Object"};
@@ -183,8 +183,8 @@ link93[] = {82,76};
link94[] = {83,16};
link95[] = {83,22};
link96[] = {84,31};
-globals[] = {0.000000,0,0,0,0,640,480,1,247,6316128,1,-566.678223,916.507324,1906.129761,921.949097,1287,854,1};
-window[] = {2,-1,-1,-1,-1,923,-1524,-540,156,3,1305};
+globals[] = {0.000000,0,0,0,0,640,480,1,247,6316128,1,-320.898621,993.773193,1636.447266,764.085449,1287,854,1};
+window[] = {2,-1,-1,-1,-1,871,104,1088,104,3,1305};
*//*%FSM</HEAD>*/
class FSM
{
@@ -236,17 +236,7 @@ class FSM
{
name = "FINISH";
itemno = 1;
- init = /*%FSM<STATEINIT""">*/"// setup display EH's" \n
- "{" \n
- " (findDisplay 46) displayAddEventHandler [_x,([""CfgEpochClient"", _x, """"] call EPOCH_fnc_returnConfigEntryV2)];" \n
- "} forEach ([""CfgEpochClient"", ""displayAddEventHandler"", []] call EPOCH_fnc_returnConfigEntryV2);" \n
- "" \n
- "// reset anim state" \n
- "player switchMove """";" \n
- "" \n
- "// setup Epoch Hud" \n
- "call epoch_dynamicHUD_start;" \n
- "[] spawn EPOCH_masterLoop;" \n
+ init = /*%FSM<STATEINIT""">*/"[] spawn EPOCH_masterLoop;" \n
"" \n
"EPOCH_loginFSM = nil;" \n
"EPOCH_playerLoginInit = nil;" \n
@@ -484,14 +474,14 @@ class FSM
precondition = /*%FSM<STATEPRECONDITION""">*/""/*%FSM</STATEPRECONDITION""">*/;
class Links
{
- /*%FSM<LINK "true">*/
- class true
+ /*%FSM<LINK "Player_In_Game">*/
+ class Player_In_Game
{
itemno = 24;
priority = 0.000000;
to="Setup_EH_s_and_H";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"true"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"getClientStateNumber > 8"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -963,7 +953,7 @@ class FSM
priority = 0.000000;
to="FINISH";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
- condition=/*%FSM<CONDITION""">*/"!(isNull (findDisplay 46)) && {preloadCamera _playerPos}"/*%FSM</CONDITION""">*/;
+ condition=/*%FSM<CONDITION""">*/"preloadCamera _playerPos"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/"call compile _extraPayload;"/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/
@@ -1433,4 +1423,4 @@ class FSM
"Reject_without_B",
};
};
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/
@@ -27,7 +27,7 @@
private ["_mName","_mrkr"];
//[[[end]]]
params [["_trgt", str(diag_tickTime)],["_mPos", position player],["_mShape","ICON"],["_mType","mil_dot"],["_mColor","ColorBlack"],["_mSize",[0.7,0.7]],["_mBrush",""],["_mDir",0],["_mText",""],["_mAlpha",1],["_mName",""]];
-diag_log format["Epoch: ADMIN: Creating marker at %1 called %2 (Params:%3).", _mPos, _trgt, _paramres];
+diag_log format["Epoch: DEBUG: Creating marker at %1 called %2 (Params:%3).", _mPos, _trgt, _this];
if(_mName == "")then{_mName = str(_trgt) + str(diag_tickTime);};
_mrkr = createMarkerLocal [_mName, _mPos];
@@ -50,8 +50,8 @@ if (!isNull EPOCH_currentTarget && vehicle player == player) then {
_icon = "\x\addons\a3_epoch_code\Data\UI\loading_bar_%1.paa";
_color = [100,0,_stability,1] call EPOCH_colorRange;
};
- case 1: {
- _text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Press (%1)",EPOCH_keysBuildMode1 call BIS_fnc_keyCode] }];
+ case 1: {
+ // _text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Hold (%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";
_color = [100,0,_stability,1] call EPOCH_colorRange;
@@ -78,7 +78,7 @@ if (!isNull EPOCH_currentTarget && vehicle player == player) then {
};
case 4: {
// Base Objects With Storage
- _text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Press (%1) or (%2)",EPOCH_keysBuildMode1 call BIS_fnc_keyCode, ((actionKeys "Gear" select 0) call BIS_fnc_keyCode),_text] }];
+ _text = if (EPOCH_buildMode > 0) then[{_text}, { format ["Hold (%1) or (%2)",EPOCH_keysAction call BIS_fnc_keyCode, ((actionKeys "Gear" select 0) call BIS_fnc_keyCode),_text] }];
_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";
_color = [100,0,_stability,1] call EPOCH_colorRange;
@@ -18,7 +18,7 @@ private ["_bomb","_config","_currentLimit","_disableAI","_driver","_grp","_index
params ["_unitClass",["_trgt",player],["_doVariable",false]];
_bomb = objNull;
-diag_log format["DEBUG: Antagonist %1 Spawning on %2. Do variable: %3.", _unitClass, _trgt, _doVariable];
+// diag_log format["DEBUG: Antagonist %1 Spawning on %2. Do variable: %3.", _unitClass, _trgt, _doVariable];
if(random 100 < 6)then{
[] execFSM "\x\addons\a3_epoch_code\System\Event_Air_Drop.fsm";
@@ -50,10 +50,7 @@ if !(isNull _object) then{
{
_recipeItem = _x;
_recipeQty = 1;
- if (_x isEqualType[]) then{
- _recipeItem = _x select 0;
- _recipeQty = _x select 1;
- };
+ _x params [["_recipeItem",_recipeItem],["_recipeQty",_recipeQty]];
_recipeCount = _recipeCount + _recipeQty;
_currentCount = { _x == _recipeItem } count _mags;
if (_currentCount < _recipeQty) exitWith{
@@ -66,11 +63,7 @@ if !(isNull _object) then{
{
_recipeItem = _x;
_recipeQty = 1;
- if (_x isEqualType[]) then{
- _x params ["_recipeItem","_recipeQty"];
- _recipeItem = _x select 0;
- _recipeQty = _x select 1;
- };
+ _x params [["_recipeItem",_recipeItem],["_recipeQty",_recipeQty]];
if ([_recipeItem, "CfgWeapons"] call EPOCH_fnc_isAny) then{
_items = items player;
_currentCount = { _x == _recipeItem } count _items;
Oops, something went wrong.

0 comments on commit ed29f44

Please sign in to comment.