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.6.021

Browse Source
This commit is contained in:
vbawol 2015-12-16 11:38:25 -06:00
parent 3d6f43a36c
commit 9f001b8899
7 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelogs/0.3.6.0.txt
View File

@ -1,5 +1,5 @@
**Client**
[Added] Added ability to sell Primary weapon from hands and empty backpacks. Thanks to @He-Man
[Added] Ability to sell Primary weapon from hands and empty backpacks. Thanks to @He-Man
[Changed] Increased max player load 2x to compensate for the new stamina system in 1.54.
[Changed] Increased backpack storage limits to allow carrying long weapons.
[Fixed] Updated Epoch armor stats UI system to support new changes since 1.54.

2
Sources/epoch_code/compile/inventory/EPOCH_gearArmorCalc.sqf
View File

@ -16,7 +16,7 @@
_vestArmor = (vest player) call EPOCH_gearArmorCalc;
Parameter(s):
_this select 0: STRING - Vest or Headhear classname
_this: STRING - Vest or Headhear classname
Returns:
NUMBER

24
Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf
View File

@ -1,3 +1,27 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors: Raimonds Virtoss
Description:
Epoch Item Interact
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/master/Sources/epoch_code/compile/inventory/EPOCH_itemInteractClick.sqf
Example:
onLBSelChanged = "_this call EPOCH_itemInteractClick";
Parameter(s):
_this select 0: CONTROL - control
_this select 1: NUMBER - listbox index
Returns:
BOOL - allways returns true
*/
private ["_data","_confData","_usedIn","_type","_interactOption","_buttonTXT","_control","_index","_text","_pic","_craftingArray","_craftingArrayNames","_config","_craftingConfig","_display","_useBtn"];
EPOCH_InteractedItem = [];

26
Sources/epoch_code/compile/inventory/EPOCH_itemInteractDblClick.sqf
View File

@ -1,3 +1,27 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors: Raimonds Virtoss
Description:
Epoch Item Interact when double clicked
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/master/Sources/epoch_code/compile/inventory/EPOCH_itemInteractDblClick.sqf
Example:
onLBDblClick = "_this call EPOCH_itemInteractDblClick";
Parameter(s):
_this select 0: CONTROL - control
_this select 1: NUMBER - listbox index
Returns:
NOTHING
*/
EPOCH_InteractedItem = [];
_control = _this select 0;
_index = _this select 1;
@ -22,4 +46,4 @@ if (isClass (_craftingConfig)) then {
(EPOCH_InteractedItem select 0) call EPOCH_crafting_load;
} else {
//TODO: eat, drink, build ... etc
};
};

29
Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
View File

@ -1,3 +1,27 @@
/*
Author: Aaron Clark - EpochMod.com
Contributors:
Description:
workaround for weapons not returning class in the inventory listboxes
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/master/Sources/epoch_code/compile/inventory/EPOCH_selectInventoryItem.sqf
Example:
[_control,_index] call EPOCH_selectInventoryItem;
Parameter(s):
_this select 0: CONTROL - control
_this select 1: NUMBER - listbox index
Returns:
NOTHING
*/
private ["_index","_data","_control","_text","_pic","_craftingArray","_craftingArrayNames"];
EPOCH_InteractedItem = [];
@ -16,9 +40,8 @@ _pic = _control lbPicture _index;
_craftingArray = [];
_craftingArrayNames = [];
comment 'Not ideal This is needed as weapons do not return a class in the UI';
comment 'This test is to over come an issue that causes the wrong class selected';
comment 'when more than two classes share the same displayName';
// This test is to over come an issue that causes the wrong class selected
// when more than two classes share the same displayName
if (_data == "") then {
{
_name = configName(_x);

2
Sources/epoch_config/Configs/CfgVehicles.hpp
View File

@ -3799,7 +3799,7 @@ class CfgVehicles
onlyforplayer = 1;
position = "NWall_trigger";
radius = 2.5;
condition = "!(EPOCH_buildMode > 0) && !(call EPOCH_lockCheck) && (this animationPhase ""NWall"" < 0.5)";
condition = "(EPOCH_buildMode > 0) && !(call EPOCH_lockCheck) && (this animationPhase ""NWall"" < 0.5)";
statement = "[this,""NWall"",1] call EPOCH_changeWallState";
};
class remove_nwall : add_nwall

4
Sources/epoch_config/Configs/CfgWeapons.hpp
View File

@ -593,6 +593,7 @@ class CfgWeapons
displayName = "$STR_A3_V_PlateCarrier1_rgr0";
picture = "\A3\characters_f\Data\UI\icon_V_plate_carrier_1_CA.paa";
model = "\x\addons\a3_epoch_assets\models\parcel.p3d";
descriptionShort = "$STR_A3_SP_AL_III";
class ItemInfo : ItemInfo
{
uniformModel = "\A3\Characters_F\BLUFOR\equip_b_vest02";
@ -634,6 +635,7 @@ class CfgWeapons
displayName = "$STR_A3_V_PlateCarrier2_rgr0";
picture = "\A3\characters_f\Data\UI\icon_V_plate_carrier_2_CA.paa";
model = "\x\addons\a3_epoch_assets\models\parcel.p3d";
descriptionShort = "$STR_A3_SP_AL_IV";
class ItemInfo : ItemInfo
{
uniformModel = "\A3\Characters_F\BLUFOR\equip_b_vest01";
@ -675,6 +677,7 @@ class CfgWeapons
displayName = "$STR_A3_V_PlateCarrier2_rgr0";
picture = "\A3\characters_f\Data\UI\icon_V_plate_carrier_2_CA.paa";
model = "\x\addons\a3_epoch_assets\models\parcel.p3d";
descriptionShort = "$STR_A3_SP_AL_IV";
class ItemInfo : ItemInfo
{
uniformModel = "\A3\Characters_F\BLUFOR\equip_b_vest01.p3d";
@ -718,6 +721,7 @@ class CfgWeapons
model = "\x\addons\a3_epoch_assets\models\parcel.p3d";
hiddenSelections[] = {"camo"};
hiddenSelectionsTextures[] = {"\A3\Characters_F_Mark\BLUFOR\Data\carrier_gl_rig_grn_co.paa"};
descriptionShort = "$STR_A3_SP_ER";
class ItemInfo : ItemInfo
{
uniformModel = "\A3\Characters_F\BLUFOR\equip_b_carrier_gl_rig.p3d";