Permalink
Browse files

Merge pull request #669 from EpochModTeam/experimental

release 0.4 b668
  • Loading branch information...
2 parents ed29f44 + 1660e7f commit 461af9b864153de1e4ab4aabfe26e7c00b02af62 @vbawol vbawol committed on GitHub Dec 2, 2016
Showing with 238 additions and 173 deletions.
  1. BIN Server_Install_Pack/@epochhive/addons/epoch_server.pbo
  2. BIN Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo
  3. BIN Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo
  4. BIN Server_Install_Pack/@epochhive/epochserver.so
  5. BIN Server_Install_Pack/@epochhive/libhiredis.so.0.10
  6. BIN Server_Install_Pack/@epochhive/libpcre.so.3
  7. BIN Server_Install_Pack/mpmissions/epoch.Altis.pbo
  8. BIN Server_Install_Pack/mpmissions/epoch.Australia.pbo
  9. BIN Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo
  10. BIN Server_Install_Pack/mpmissions/epoch.Bornholm.pbo
  11. BIN Server_Install_Pack/mpmissions/epoch.Chernarus.pbo
  12. BIN Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo
  13. BIN Server_Install_Pack/mpmissions/epoch.Desert_E.pbo
  14. BIN Server_Install_Pack/mpmissions/epoch.Esseker.pbo
  15. BIN Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo
  16. BIN Server_Install_Pack/mpmissions/epoch.Napf.pbo
  17. BIN Server_Install_Pack/mpmissions/epoch.Porto.pbo
  18. BIN Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo
  19. BIN Server_Install_Pack/mpmissions/epoch.Sara.pbo
  20. BIN Server_Install_Pack/mpmissions/epoch.SaraLite.pbo
  21. BIN Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo
  22. BIN Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo
  23. BIN Server_Install_Pack/mpmissions/epoch.Stratis.pbo
  24. BIN Server_Install_Pack/mpmissions/epoch.Takistan.pbo
  25. BIN Server_Install_Pack/mpmissions/epoch.Tanoa.pbo
  26. BIN Server_Install_Pack/mpmissions/epoch.VR.pbo
  27. BIN Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo
  28. BIN Server_Install_Pack/mpmissions/epoch.Zargabad.pbo
  29. BIN Server_Install_Pack/mpmissions/epoch.utes.pbo
  30. BIN Server_Install_Pack/mpmissions/epoch_RyanZed.Tanoa.pbo
  31. +1 −1 Server_Install_Pack/sc/BattlEye/deleteVehicle.txt
  32. +4 −5 Server_Install_Pack/sc/BattlEye/scripts.txt
  33. +2 −1 Sources/epoch_code/compile/EPOCH_consumeItem.sqf
  34. +1 −1 Sources/epoch_code/compile/EPOCH_lootTrash.sqf
  35. +36 −0 Sources/epoch_code/compile/functions/EPOCH_returnConfigV2.sqf
  36. +3 −1 Sources/epoch_code/compile/inventory/EPOCH_initUI.sqf
  37. +2 −1 Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf
  38. +13 −11 Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
  39. +11 −7 Sources/epoch_code/compile/setup/masterLoop/init.sqf
  40. +130 −124 Sources/epoch_code/gui/scripts/craftingv2/EPOCH_crafting_load.sqf
  41. +1 −0 Sources/epoch_config/Configs/CfgClientFunctions.hpp
  42. +2 −2 Sources/epoch_config/Configs/CfgEpochClient.hpp
  43. +1 −1 Sources/epoch_config/build.hpp
  44. +1 −1 Sources/epoch_server/build.hpp
  45. +1 −1 Sources/epoch_server/compile/epoch_group/EPOCH_server_updatePlayerGroup.sqf
  46. +1 −1 Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
  47. +1 −1 Sources/epoch_server/compile/epoch_player/EPOCH_server_revivePlayer.sqf
  48. +12 −1 Sources/epoch_server/init/server_init.sqf
  49. +3 −3 Sources/epoch_server/init/server_securityfunctions.sqf
  50. +9 −7 Sources/epoch_server/system/server_monitor.fsm
  51. +1 −1 Sources/epoch_server_core/build.hpp
  52. +1 −1 Sources/epoch_server_settings/build.hpp
  53. BIN Sources/mpmissions/epoch.Altis/treeView.txt
  54. BIN Sources/mpmissions/epoch.Australia/treeView.txt
  55. BIN Sources/mpmissions/epoch.Bootcamp_ACR/treeView.txt
  56. BIN Sources/mpmissions/epoch.Bornholm/treeView.txt
  57. BIN Sources/mpmissions/epoch.Chernarus/treeView.txt
  58. BIN Sources/mpmissions/epoch.Chernarus_Summer/treeView.txt
  59. BIN Sources/mpmissions/epoch.Desert_E/treeView.txt
  60. BIN Sources/mpmissions/epoch.Esseker/treeView.txt
  61. BIN Sources/mpmissions/epoch.Mountains_ACR/treeView.txt
  62. BIN Sources/mpmissions/epoch.Napf/treeView.txt
  63. BIN Sources/mpmissions/epoch.Porto/treeView.txt
  64. BIN Sources/mpmissions/epoch.ProvingGrounds_PMC/treeView.txt
  65. BIN Sources/mpmissions/epoch.Sara/treeView.txt
  66. BIN Sources/mpmissions/epoch.SaraLite/treeView.txt
  67. BIN Sources/mpmissions/epoch.Sara_dbe1/treeView.txt
  68. BIN Sources/mpmissions/epoch.Shapur_BAF/treeView.txt
  69. BIN Sources/mpmissions/epoch.Stratis/treeView.txt
  70. BIN Sources/mpmissions/epoch.Takistan/treeView.txt
  71. BIN Sources/mpmissions/epoch.Tanoa/treeView.txt
  72. BIN Sources/mpmissions/epoch.VR/treeView.txt
  73. BIN Sources/mpmissions/epoch.Woodland_ACR/treeView.txt
  74. BIN Sources/mpmissions/epoch.Zargabad/treeView.txt
  75. BIN Sources/mpmissions/epoch.utes/treeView.txt
  76. BIN Sources/mpmissions/epoch_RyanZed.Tanoa/treeView.txt
  77. +1 −1 build.txt
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
-5 "" !="[0-9]:[0-9]{1,4}" !" GroundWeaponHolder$" !" WeaponHolderSimulated$" !" Epoch_(Sapper|SapperB|Cloak|Female_CamoRed)_F$" !" EPOCH_RyanZombie_[1-5](|_(C|Sp|B|W|M|P))$" !" (Land_MPS|Bobber|Rabbit)_EPOCH$" !" (Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH$" !" (Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Cabinet|Freezer|Tarp)_EPOCH$" !" (SapperHead|Jack|SolarGen)_SIM_EPOCH$" !" (Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH$" !" Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH$" !" (Safe|Workbench|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace|TankTrap)_SIM_EPOCH$" !" (Hesco3|Metal|WoodWall[1-4])_(Ghost|SIM)_EPOCH$" !" (Spike|Metal)_TRAP_SIM_EPOCH$" !" (WoodFoundation|Foundation)_Ghost_EPOCH$" !" I_(Soldier[1-3]|Soldier)_EPOCH$" !" I_(helipilot|helicrew)_F$" !" I_UAV_01_F$" !" (I|B|O)_UAV_AI$" !" I_Boat_Armed_01_minigun_F" !" B_Heli_Transport_01_F" !" Land_Cages_F$"
+5 "" !="[0-9]{1,2}:[0-9]{1,4}" !" GroundWeaponHolder$" !" WeaponHolderSimulated$" !" Epoch_(Sapper|SapperB|Cloak|Female_CamoRed)_F$" !" EPOCH_RyanZombie_[1-5](|_(C|Sp|B|W|M|P))$" !" (Land_MPS|Bobber|Rabbit)_EPOCH$" !" (Sheep|Goat|Snake|Snake2|Hen|Cock|Fin|Alsatian)_random_EPOCH$" !" (Bed|locker|Filing|Chair|ChairRed|wardrobe|cooker|Couch|Table|Pelican|Fridge|Shelf|ToolRack|Shoebox|Bunk|Cabinet|Freezer|Tarp)_EPOCH$" !" (SapperHead|Jack|SolarGen)_SIM_EPOCH$" !" (Tipi|Workbench|StorageShelf|CinderWallHalf|Foundation|Wood(Floor|LargeWall|Stairs|Ramp|Foundation|Ladder|Tower))_Ghost_EPOCH$" !" Wood(Floor|LargeWall|LargeWallCor|LargeWallDoor|LargeWallDoorL|LargeWallDoorway|Stairs|Stairs2|Ramp|Ladder|Tower)_SIM_EPOCH$" !" (Safe|Workbench|LockBox|CinderWall|CinderWallGarage|CinderWallHalf|PlotPole|Tipi|StorageShelf|Fireplace|TankTrap)_SIM_EPOCH$" !" (Hesco3|Metal|WoodWall[1-4])_(Ghost|SIM)_EPOCH$" !" (Spike|Metal)_TRAP_SIM_EPOCH$" !" (WoodFoundation|Foundation)_Ghost_EPOCH$" !" I_(Soldier[1-3]|Soldier)_EPOCH$" !" I_(helipilot|helicrew)_F$" !" I_UAV_01_F$" !" (I|B|O)_UAV_AI$" !" I_Boat_Armed_01_minigun_F" !" B_Heli_Transport_01_F" !" Land_Cages_F$"
@@ -9,8 +9,7 @@
7 allMissionObjects !="_alljammer = allmissionobjects 'PlotPole_EPOCH';"
7 callExtension
7 showCommandingMenu !="showCommandingMenu '';" !="showCommandingMenu '#USER:"
-7 moveIn !="\"BIS_fnc_moveIn\"" !="\"A3\functions_f\Misc\fn_moveIn.sqf\"" !="\"A3\functions_f\arrays\fn_removeIndex.sqf\"" !="player moveInAny _vehicle;\nEPOCH_antiWallCount = EPOCH_antiWallCount + 1;" !="[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];\n_driver moveInAny _unit;" !="_driver moveInAny Epoch_mission_uav;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP;" !="_driver moveInDriver _axeCopter;" !="_unit moveInGunner _axeCopter;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP;" !="_driver moveInAny axeUAV"
-7 attachTo !="attachToRelative" !="_meat attachTo [_object,[0,0,0.2],\"head\"];" !="setParticleClass \"ObjectDestructionFire1Smallx\";\n_source01 attachto [_object,[0,0,0]];" !="_smoke1 attachTo [_v,[0,0,0],\"engine_effect_1\"];" !="EP_light attachTo [player,[0,8.11,_nlZ]];" !="_bomb attachTo [_unit, [0,0,0],\"Pelvis\"];" !="_dogHolder attachTo [_dog, [-0.2,1.2,0.7]];" !="EPOCH_target attachTo[player];" !="_sapperSmoke attachTo [_sapper,[0,0,-0.4]];" !="_cage attachTo [_cage2,[0,1.3,0]];" !="_flame attachto [_unit,[0,0,0]];"
+7 moveIn !="fnc_moveInCargo" !="\"BIS_fnc_moveIn\"" !="\"A3\functions_f\Misc\fn_moveIn.sqf\"" !="\"A3\functions_f\arrays\fn_removeIndex.sqf\"" !="player moveInAny _vehicle;\nEPOCH_antiWallCount = EPOCH_antiWallCount + 1;" !="[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];\n_driver moveInAny _unit;" !="_driver moveInAny Epoch_mission_uav;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP;" !="_driver moveInDriver _axeCopter;" !="_unit moveInGunner _axeCopter;" !="axeVIP moveInDriver vehicle axeVIP;" !="axeVIP moveInCargo vehicle axeVIP;" !="_driver moveInAny axeUAV"
7 enableCollisionWith
7 hideObject !="_dogHolder hideobject true;" !="_dogHolder hideobject false;" !="player hideobject true;" !="_ship hideobject true;\n_ship hideobjectglobal true;"
7 setvelocity !="setVelocityTarget" !="_bolt setPosATL _pos;\n_bolt setVelocity [0, 0, -10];" !="EPOCH_target setvelocitytransformation" !="_currentTarget setVelocity [0,0,-0.01];" !="_head setVelocity [\n(sin _dir * _speed), \n(cos _dir * _speed)" !="_vel = velocity this; _dir = getDir player; this setVelocity[(_vel select 0)+(sin _dir * 2),(_vel select 1)+(cos _dir * 2),(_vel select 2)];" !="_head setVelocity [random 2,random 2,10];" !="_bobber setVelocity [0,-1,-10];" !="_x setvelocity [0,0,0.1];" !="_veh setVelocity [0,0,0];" !="_this select 0 setvelocity (_this select 1)" !="_zombie setVelocityTransformation [_aslPos,_aslPos,_unitV,_unitV,_unitvDir,_vDir,_unitvUp,_unitvUp,2];"
@@ -23,7 +22,7 @@
7 addMagazineCargo !="_dogHolder addMagazineCargo [\"RabbitCarcass_EPOCH\", 1]" !="_dogHolder addMagazineCargo [\"Pelt_EPOCH\", 1]" !="_dogHolder addMagazineCargo [\"Venom_EPOCH\", 1]" !="_dogHolder addMagazineCargo [\"SnakeCarcass_EPOCH\", 1]" !="_dogHolder addMagazineCargo [\"ChickenCarcass_EPOCH\", 1]" !="_acceptHolder addMagazineCargo [_wAmmo, 1] ;" !="CBA_fnc_addMagazineCargo" !="\\fnc_addMagazineCargo" !="\"addMagazineCargo" !="cba_fAddMagazineCargo"
7 addItem !="{player addItemToVest _x} forEach _vestItems;" !="player addItem _item;" !="_plyr addItemToVest _missionItem;" !="axeVIP addItemToVest _item;" !="_plyr addItemToVest _missionItem;" !="EPOCH_fnc_addItemOverflow" !="CBA_fnc_addItem" !="\\fnc_addItem" !="\"addItem" !="fnc_addItemCargo"
7 addBackPack !="fnc_addBackpackCargo"
-7 addMissionEventHandler !="addMissionEventHandler [\"HandleDisconnect\"," !="addMissionEventHandler [\"Loaded\"," !="addMissionEventHandler ['Draw3D',_var + \"call Epoch_gui3DCooldownEH;\"];" !="addMissionEventHandler ['Draw3D',_var + \"call epoch_gui3dModelPosEH;\"];" !="addMissionEventHandler ['Draw3D',_var + \"call epoch_gui3dWorldPosEH;\"];" !="addMissionEventHandler [\n\"ended\",\n{\n\nBIS_fnc_missionHandlers_end = _this;"
+7 addMissionEventHandler !="CBA_clientID = [0, 2] select isMultiplayer;\naddMissionEventHandler [\"PlayerConnected\", {\nparams [\"_id\", \"_uid\", \"_name\"" !="addMissionEventHandler [\"EachFrame\", cba_common_fnc_onFrame];" !="addMissionEventHandler [\"HandleDisconnect\"," !="addMissionEventHandler [\"Loaded\"," !="addMissionEventHandler ['Draw3D',_var + \"call Epoch_gui3DCooldownEH;\"];" !="addMissionEventHandler ['Draw3D',_var + \"call epoch_gui3dModelPosEH;\"];" !="addMissionEventHandler ['Draw3D',_var + \"call epoch_gui3dWorldPosEH;\"];" !="addMissionEventHandler [\n\"ended\",\n{\n\nBIS_fnc_missionHandlers_end = _this;"
7 removeMissionEventHandler !="removeMissionEventHandler [\"Draw3D\", _id];"
7 removeAllWeapons !="removeAllWeapons axeGeneral;"
7 removeAllItems
@@ -33,7 +32,7 @@
7 createVehicleCrew !="createvehiclecrew _x;"
7 createVehicleLocal !="\"#particlesource\" createVehicleLocal" !="\"#lightpoint\" createVehicleLocal" !="\"BloodSplat\" createVehicleLocal" !="[\"lightning1_F\", \"lightning2_F\"] call BIS_fnc_selectRandom;\n_lighting = _class createVehicleLocal" !="SLX_XEH_DUMMY createVehicleLocal [0, 0, 0];" !="CBA_eventHandlers = \"Logic\" createVehicleLocal [0, 0];"
7 createUnit !="_driver = _grp createUnit[\"I_UAV_AI\", position _unit, [], 0, \"CAN_COLLIDE\"];" !="axeGeneral = grpVIPGeneral createUnit [\"I_officer_F\", axeGeneralPos, [], 1, \"CAN_COLLIDE\"];" !="bis_functions_mainscope = _grpLogic createunit [\"Logic\",[9,9,9],[],0,\"none\"];" !="_unit = _grp createUnit[selectRandom _arrUnits, _pos, [], 0, \"FORM\"];" !="_driver = (group player) createUnit[\"I_UAV_AI\", position axeUAV, [], 0, \"CAN_COLLIDE\"];"
-7 createAgent !="bis_revive_ratioLethal = createAgent [\"Logic\", [10,10,0], [], 0, \"CAN_COLLIDE\"];" !="_unit = createAgent[_unitClass, _targetPos, [], 256, \"FORM\"];" !="_unit = createAgent [_unitClass, _targetPos, [], 120, \"FORM\"];" !="_animal = createAgent[_randomAIClass, _animalPos, [], 5, \"NONE\"];" !="_unit = createAgent [\"Epoch_Cloak_F\", _pos, [], 0, \"CAN_COLLIDE\"];" !="_unit = createAgent [\"Epoch_Sapper_F\", _targetPos, [], 180, \"FORM\"];" !="_sapper = createAgent [\"Epoch_Sapper_F\", getPos _cage2, [], 0, \"FORM\"];" !="_unit = createAgent[_unitClass, position player, [], _zRange, \"FORM\"];" !="_animal = createAgent[_randomAIClass, _animalPos, [], 0, \"CAN_COLLIDE\"];" !="_axeSapper = createAgent [\"Epoch_Sapper_F\", _pos, [], 12, \"FORM\"];"
+7 createAgent !="bis_revive_ratioLethal = createAgent [\"Logic\", [10,10,0], [], 0, \"CAN_COLLIDE\"];" !="_unit = createAgent[_unitClass, _targetPos, [], 256, \"FORM\"];" !="_unit = createAgent [_unitClass, _targetPos, [], 120, \"FORM\"];" !="_animal = createAgent[_randomAIClass, _animalPos, [], 5, \"NONE\"];" !="_unit = createAgent [\"Epoch_Cloak_F\", _pos, [], 0, \"CAN_COLLIDE\"];" !="_unit = createAgent [\"Epoch_Sapper_F\", _targetPos, [], 180, \"FORM\"];" !="_sapper = createAgent [\"Epoch_Sapper_F\", getPos _cage2, [], 0, \"FORM\"];" !="_unit = createAgent[_unitClass, position player, [], _zRange, \"FORM\"];" !="_animal = createAgent[_randomAIClass, _animalPos, [], 0, \"CAN_COLLIDE\"];" !="_axeSapper = createAgent [\"Epoch_Sapper_F\", _pos, [], 12, \"FORM\"];" !="_nestMate = createAgent [\"Epoch_Sapper_F\", _garrPos, [], 0, \"FORM\"];"
7 createTeam
7 createDialog !="createDialog \"rmx_dynamenu\";" !="createDialog \"rmx_craftingUI\";" !="createDialog \"QuickUpgrade\";" !="createDialog \"QuickTake\";" !="createDialog \"InteractBank\";" !="createdialog \"SelectGender\";" !="_handled = createdialog _dialog;" !="if !(createdialog \"InteractItem\") exitWith {};" !="createDialog _tapDiag;" !="if !(createdialog \"Trade\") exitWith {};" !="_ok = createdialog \"Interact\";" !="_ok = createdialog \"TradeNPCMenu\";" !="createDialog \"Epoch_myGroup\";" !="createDialog (if ((Epoch_my_GroupUID == \"\") && (Epoch_my_Group isEqualTo [])) then {\"EPOCH_createGrp\"} else {\"Epoch_myGroup\"});" !="createDialog \"GroupRequests\";" !="_ok = createdialog \"MissionSelect\";" !="createDialog 'Skaronator_AdminMenu';"
7 createDisplay !="createDisplay \"rmx_dynamenu\";" !="createDisplay \"rmx_moveDynamicHUD\";" !="_parent createdisplay _displayClass;" !="finddisplay 151 createdisplay 'RscDisplayOptionsLayout'"
@@ -49,7 +48,7 @@
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\"" !="_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 ctrlAddEventHandler !="_control = _display displayctrl 37305; \n_control 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\";"
7 displayRemoveAllEventHandlers !="_display displayRemoveAllEventHandlers _x;" !="if !(isMultiplayer) then { { (findDisplay 46) displayRemoveAllEventHandlers _x } forEach [\"KeyUp\", \"KeyDown\"] };"
7 removeAllMissionEventHandlers
@@ -19,7 +19,8 @@ private ["_buildClass","_buildingCountLimit","_buildingJammerRange","_canCapacit
EPOCH_InteractedItem params ["_text","_item","_pic"];
_cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig;
-_cfgItemInteractions = (('CfgItemInteractions' call EPOCH_returnConfig) >> _item);
+_cfgItemInteractions = ["CfgItemInteractions", _item] call EPOCH_returnConfigV2;
+// _cfgItemInteractions = (('CfgItemInteractions' call EPOCH_returnConfig) >> _item);
_interactOption = getNumber(_cfgItemInteractions >> "interactAction");
_interactAttributes = getArray(_cfgItemInteractions >> "interactAttributes");
@@ -109,7 +109,7 @@ if (diag_tickTime - EPOCH_lastTrash > 2) then {
{
_index = lbAdd[21500, name _x];
lbSetData[21500, _index, netId _x];
- } forEach(playableUnits - [player]);
+ } forEach(allPlayers - [player]);
};
_return = true;
};
@@ -0,0 +1,36 @@
+/*
+ Author: Aaron Clark - EpochMod.com
+
+ Contributors:
+
+ Description:
+ Returns missionConfigFile if exists otherwise uses configFile
+
+ Licence:
+ Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike
+
+ Github:
+ https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_code/compile/functions/EPOCH_returnConfig.sqf
+
+ Example:
+ [['CfgCrafting', 'item1']] call EPOCH_returnConfigV2;
+
+ Parameter(s):
+ _this: ARRAY of STRING/s - Config class name Array
+
+ Returns:
+ CONFIG
+*/
+//[[[cog import generate_private_arrays ]]]
+private ["_missionconfig","_return"];
+//[[[end]]]
+_return = configfile;
+_missionconfig = missionConfigFile;
+{
+ _return = (_return >> _x);
+ _missionconfig = (_missionconfig >> _x);
+} forEach _this;
+if (isClass _missionconfig) then{
+ _return = _missionconfig;
+};
+_return
@@ -29,7 +29,9 @@ private ["_bar","_bar_compare","_color","_colorCompare","_container","_display",
disableSerialization;
EPOCH_InteractedItem = [];
-EPOCH_lastContainer = _this select 1;
+params ["_unit","_targetContainer","_secondaryContainer"];
+EPOCH_targetContainer = _targetContainer;
+EPOCH_secondaryContainer = _secondaryContainer;
waitUntil {!isNull findDisplay 602};
_display = (findDisplay 602);
@@ -21,7 +21,8 @@ _buttonTXT = "";
_magCount = 1;
_interactActions = [];
_config = (configfile >> "CfgWeapons" >> _data);
-_cfgItemInteractions = (('CfgItemInteractions' call EPOCH_returnConfig) >> _data);
+// _cfgItemInteractions = (('CfgItemInteractions' call EPOCH_returnConfig) >> _data);
+_cfgItemInteractions = ["CfgItemInteractions", _data] call EPOCH_returnConfigV2;
if (isClass (_config)) then {
_type = getNumber (_config >> "type");
_interactOption = getNumber (_cfgItemInteractions >> "interactAction");
@@ -23,7 +23,7 @@
NOTHING
*/
//[[[cog import generate_private_arrays ]]]
-private ["_arr","_craftingArray","_craftingArrayNames","_data","_exit","_index","_name","_pic","_text"];
+private ["_container","_craftingArray","_craftingArrayNames","_data","_idc","_index","_pic","_text","_weaponsAndItems"];
//[[[end]]]
params ["_control","_index"];
EPOCH_InteractedItem = [];
@@ -32,24 +32,26 @@ if (_index isEqualType []) then {
_index = (_index select 0) select 1;
};
+_idc = ctrlIDC _control;
_text = _control lbText _index;
_data = _control lbData _index;
_pic = _control lbPicture _index;
+_val = _control lbValue _index;
_craftingArray = [];
_craftingArrayNames = [];
-// This test is to over come an issue that causes the wrong class selected
-// when more than two classes share the same displayName
+// weapons and items do not return a class so a workaround is used to find the class
if (_data == "") then {
- {
- _name = configName(_x);
- _exit = false;
- if !(isNull EPOCH_lastContainer) then {
- _arr = ((getItemCargo EPOCH_lastContainer) select 0) + [uniform player,vest player,headgear player];
- _exit = (_name in _arr);
+ _container = switch (_idc) do {
+ case 633: { uniformContainer player };
+ case 638: { vestContainer player };
+ case 632: { EPOCH_targetContainer };
+ case 640: { EPOCH_secondaryContainer };
+ default { backpackContainer player };
};
- if (_exit) exitWith {_data = _name};
- } forEach ("getText (_x >> 'displayName') == _text" configClasses(configFile >> "CfgWeapons"));
+ _weaponsAndItems = ((getWeaponCargo _container) select 0);
+ _weaponsAndItems append ((getItemCargo _container) select 0);
+ _data = _weaponsAndItems param [_val,""];
};
EPOCH_InteractedItem = [_text,_data,_pic];
Oops, something went wrong.

0 comments on commit 461af9b

Please sign in to comment.