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

more fixes and cleanup

Browse Source
This commit is contained in:
vbawol 2017-03-23 15:38:19 -05:00
parent 28baecfd71
commit b5b54bd513
7 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/building/EPOCH_isBuildAllowed.sqf
View File

@ -103,9 +103,9 @@ if !(_jammer isEqualTo []) then {
["_leaderName",""], ["_leaderName",""],
["_groupSize",0], ["_groupSize",0],
["_modArray",[]], ["_modArray",[]],
["_memberArray",[]], ["_memberArray",[]]
]; ];
_membercount = count _modArray + count _memberArray _membercount = count _modArray + count _memberArray;
_storageCountLimit = _storageCountLeader + (_storageCountPerMember * _membercount); _storageCountLimit = _storageCountLeader + (_storageCountPerMember * _membercount);
_buildingCountLimit = _buildingCountLeader + (_buildingCountPerMember * _membercount); _buildingCountLimit = _buildingCountLeader + (_buildingCountPerMember * _membercount);
}; };

12
Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnInvite.sqf
View File

@ -24,7 +24,7 @@ Epoch_my_Group params [
["_leaderName",""], ["_leaderName",""],
["_groupSize",0], ["_groupSize",0],
["_modArray",[]], ["_modArray",[]],
["_memberArray",[]], ["_memberArray",[]]
]; ];
if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArray) > 0) then { if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArray) > 0) then {
@ -35,10 +35,11 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArr
_playerName = _InvitePlayerCombo lbText (lbCurSel _InvitePlayerCombo); _playerName = _InvitePlayerCombo lbText (lbCurSel _InvitePlayerCombo);
if (_playerUID != "" && _playerName != "" && ({_playerUID in _x} count (_modArray) == 0) && ({_playerUID in _x} count (_memberArray) == 0) && !(_playerUID == Epoch_my_GroupUID)) then { if (_playerUID != "" && _playerName != "" && ({_playerUID in _x} count (_modArray) == 0) && ({_playerUID in _x} count (_memberArray) == 0) && !(_playerUID == Epoch_my_GroupUID)) then {
_txt = format["Do you want to add %1 to your Group?",_playerName]; _txt = format["Do you want to add %1 to your Group?",_playerName];
[_playerUID,_txt] spawn { [_playerUID,_txt,_groupName] spawn {
_ret = [_this select 1,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage; params ["_playerUID","_txt","_groupName"];
_ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then { if (_ret) then {
[_this select 0,Epoch_my_GroupUID,_groupName,player,Epoch_personalToken] remoteExec ["EPOCH_server_invitePlayer",2]; [_playerUID,Epoch_my_GroupUID,_groupName,player,Epoch_personalToken] remoteExec ["EPOCH_server_invitePlayer",2];
}; };
}; };
}; };
@ -50,7 +51,8 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArr
_upgradeSlots = EPOCH_group_upgrade_lvl select (_found+2); _upgradeSlots = EPOCH_group_upgrade_lvl select (_found+2);
_txt = format["Do you want to upgrade your group from %1 to %2 slots for %3 Krypto?",_groupSize,_upgradeSlots,_upgradePrice]; _txt = format["Do you want to upgrade your group from %1 to %2 slots for %3 Krypto?",_groupSize,_upgradeSlots,_upgradePrice];
[_txt,_upgradePrice] spawn { [_txt,_upgradePrice] spawn {
_ret = [_this select 0,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage; params ["_txt","_upgradePrice"];
_ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then { if (_ret) then {
[Epoch_my_GroupUID,player,Epoch_personalToken] remoteExec ["EPOCH_server_upgradeGroup",2]; [Epoch_my_GroupUID,player,Epoch_personalToken] remoteExec ["EPOCH_server_upgradeGroup",2];
}; };

7
Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnKick.sqf
View File

@ -25,7 +25,7 @@ Epoch_my_Group params [
["_leaderName",""], ["_leaderName",""],
["_groupSize",0], ["_groupSize",0],
["_modArray",[]], ["_modArray",[]],
["_memberArray",[]], ["_memberArray",[]]
]; ];
if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArray) > 0) then { if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArray) > 0) then {
@ -37,9 +37,10 @@ if (_playerUID == Epoch_my_GroupUID || {_x select 0 == _playerUID}count (_modArr
if (_playerUID != "" && _playerName != "") then { if (_playerUID != "" && _playerName != "") then {
_txt = format["Do you want to kick %1 from your Group?",_playerName]; _txt = format["Do you want to kick %1 from your Group?",_playerName];
[_playerUID,_txt] spawn { [_playerUID,_txt] spawn {
_ret = [_this select 1,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage; params ["_playerUID","_txt"];
_ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then { if (_ret) then {
[Epoch_my_GroupUID,_this select 0,false,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2]; [Epoch_my_GroupUID,_playerUID,false,false,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2];
}; };
}; };
}; };

2
Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnLeave.sqf
View File

@ -22,7 +22,7 @@ Epoch_my_Group params [
["_leaderName",""], ["_leaderName",""],
["_groupSize",0], ["_groupSize",0],
["_modArray",[]], ["_modArray",[]],
["_memberArray",[]], ["_memberArray",[]]
]; ];
if (getPlayerUID player == Epoch_my_GroupUID) then { if (getPlayerUID player == Epoch_my_GroupUID) then {
_BtnLeave ctrlSetText "Delete Group"; _BtnLeave ctrlSetText "Delete Group";

5
Sources/epoch_code/gui/scripts/group/EPOCH_Group_BtnMod.sqf
View File

@ -30,9 +30,10 @@ if (getPlayerUID player == Epoch_my_GroupUID) then {
}; };
[_playerUID,_isMember,_txt] spawn { [_playerUID,_isMember,_txt] spawn {
_ret = [_this select 2,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage; params ["_playerUID","_isMember","_txt"];
_ret = [_txt,"Epoch Group Menu",true,true] call BIS_fnc_GUImessage;
if (_ret) then { if (_ret) then {
[Epoch_my_GroupUID,_this select 0,true,_this select 1,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2]; [Epoch_my_GroupUID,_playerUID,true,_isMember,player,Epoch_personalToken] remoteExec ["EPOCH_server_updatePlayerGroup",2];
}; };
}; };
}; };

2
Sources/epoch_code/gui/scripts/group/EPOCH_Group_Combo.sqf
View File

@ -22,7 +22,7 @@ Epoch_my_Group params [
["_leaderName",""], ["_leaderName",""],
["_groupSize",0], ["_groupSize",0],
["_modArray",[]], ["_modArray",[]],
["_memberArray",[]], ["_memberArray",[]]
]; ];
_ctrl = _this select 0; _ctrl = _this select 0;

2
Sources/epoch_code/gui/scripts/group/EPOCH_Group_onLoad.sqf
View File

@ -27,7 +27,7 @@ Epoch_my_Group params [
["_leaderName",""], ["_leaderName",""],
["_groupSize",0], ["_groupSize",0],
["_modArray",[]], ["_modArray",[]],
["_memberArray",[]], ["_memberArray",[]]
]; ];
_currentMaxMember = count(_modArray) + count(_memberArray) + 1; _currentMaxMember = count(_modArray) + count(_memberArray) + 1;