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

minor fixes and cleanup

Browse Source
This commit is contained in:
vbawol 2017-05-01 15:26:18 -05:00
parent c1cfc3d297
commit 0c035ae07c
5 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf
View File

@ -120,7 +120,7 @@ for "_i" from 0 to _this do {
// Handle Jammers and create marker if EPOCH_SHOW_JAMMERS set true. // Handle Jammers and create marker if EPOCH_SHOW_JAMMERS set true.
if (_class isKindOf "PlotPole_EPOCH") then { if (_class isKindOf "PlotPole_EPOCH") then {
if (EPOCH_SHOW_JAMMERS) then { if (EPOCH_SHOW_JAMMERS) then {
_marker = createMarker[str(_location), _location]; _marker = createMarker [str(_location), _location];
_marker setMarkerShape "ICON"; _marker setMarkerShape "ICON";
// TODO allow players to change this per base // TODO allow players to change this per base
_marker setMarkerType "mil_dot"; _marker setMarkerType "mil_dot";

18
Sources/epoch_server/compile/epoch_player/EPOCH_server_respawnPlayer.sqf
View File

@ -13,11 +13,11 @@
https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_player/EPOCH_server_respawnPlayer.sqf https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/compile/epoch_player/EPOCH_server_respawnPlayer.sqf
*/ */
//[[[cog import generate_private_arrays ]]] //[[[cog import generate_private_arrays ]]]
private ["_class","_defaultUniform","_dir","_location","_playerObj","_vest"]; private ["_class","_defaultUniform","_dir","_location","_vest"];
//[[[end]]] //[[[end]]]
params ["_playerObj",["_token","",[""]],"_isMale"]; params ["_player",["_token","",[""]],"_isMale"];
if !([_playerObj, _token] call EPOCH_server_getPToken) exitWith{}; if !([_player, _token] call EPOCH_server_getPToken) exitWith{};
_defaultUniform = "U_Test_uniform"; _defaultUniform = "U_Test_uniform";
_class = "Epoch_Female_F"; _class = "Epoch_Female_F";
@ -32,16 +32,16 @@ _dir = random 360;
_location = getMarkerPos "respawn_west"; _location = getMarkerPos "respawn_west";
_location set[2, 0]; _location set[2, 0];
_playerObj = (group _player) createUnit [_class, _location, [], 0, "CAN_COLLIDE"]; _player = (group _player) createUnit [_class, _location, [], 0, "CAN_COLLIDE"];
{ {
_playerObj disableAI _x; _player disableAI _x;
} forEach["FSM", "MOVE", "AUTOTARGET", "TARGET"]; } forEach["FSM", "MOVE", "AUTOTARGET", "TARGET"];
_playerObj setDir _dir; _player setDir _dir;
_playerObj setPosATL _location; _player setPosATL _location;
// send player object to player // send player object to player
["_switchPlayer_PVC",_playerObj] remoteExec ['EPOCH_playerGenderInit',_player]; ["_switchPlayer_PVC",_player] remoteExec ['EPOCH_playerGenderInit',_player];
_playerObj setVariable ["REVIVE", true]; _player setVariable ["REVIVE", true];
true true

4
Sources/epoch_server/compile/epoch_player/EPOCH_server_savePlayer.sqf
View File

@ -43,7 +43,7 @@ _allowSave = _vars isEqualTypeParams EPOCH_defaultVars;
if (_allowSave) then{ if (_allowSave) then{
if !(_vars isEqualTo EPOCH_defaultVars_SEPXVar) then{ if !(_vars isEqualTo EPOCH_defaultVars_SEPXVar) then{
_serverOnly = ["Crypto"]; private _serverOnly = ["Crypto"];
_Svars = _player getVariable["VARS", call EPOCH_defaultVars_SEPXVar]; _Svars = _player getVariable["VARS", call EPOCH_defaultVars_SEPXVar];
{ {
_cIndex = EPOCH_customVars find _x; _cIndex = EPOCH_customVars find _x;
@ -66,7 +66,7 @@ if (_allowSave) then{
if (vehicle _player != _player) then { if (vehicle _player != _player) then {
_staticTraderLocationsDistances = []; private _staticTraderLocationsDistances = [];
{ {
_staticTraderLocationsDistances pushBack [_x distance _player, _x] _staticTraderLocationsDistances pushBack [_x distance _player, _x]
} forEach EPOCH_staticTraderLocations; } forEach EPOCH_staticTraderLocations;

2
Sources/epoch_server/compile/epoch_trading/EPOCH_server_makeNPCTrade.sqf
View File

@ -282,7 +282,7 @@ if (_slot != -1) then {
} else { } else {
_wH = _nearByHolder select 0; _wH = _nearByHolder select 0;
}; };
_wh addBackpackCargoGlobal [_item,1]; _wH addBackpackCargoGlobal [_item,1];
}; };
_returnOut pushBack _item; _returnOut pushBack _item;
_itemQtys set[_qtyIndex, (_currQty - _itemQty)]; _itemQtys set[_qtyIndex, (_currQty - _itemQty)];

7
Sources/epoch_server/init/server_init.sqf
View File

@ -12,6 +12,9 @@
Github: Github:
https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/init/server_init.sqf https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_server/init/server_init.sqf
*/ */
//[[[cog import generate_private_arrays ]]]
private ["_ReservedSlots","_SideHQ1","_SideHQ2","_SideHQ3","_abortAndError","_allowedVehicleIndex","_allowedVehicleListName","_allowedVehiclesList","_allowedVehiclesListArray","_cfgServerVersion","_channelColor","_channelNumber","_channelTXT","_clientVersion","_config","_configSize","_configVersion","_date","_dateChanged","_epochConfig","_epochWorldPath","_existingStock","_hiveVersion","_index","_indexStock","_instanceID","_marker","_radio","_response","_sapper","_serverConfig","_serverSettingsConfig","_servicepoints","_startTime","_staticDateTime","_timeDifference","_vehicleCount","_vehicleSlotLimit","_worldSize"];
//[[[end]]]
_startTime = diag_tickTime; _startTime = diag_tickTime;
missionNamespace setVariable ['Epoch_ServerVersion', getText(configFile >> "CfgMods" >> "Epoch" >> "version"), true]; missionNamespace setVariable ['Epoch_ServerVersion', getText(configFile >> "CfgMods" >> "Epoch" >> "version"), true];
diag_log format["Epoch: Starting ArmA3 Epoch Server, Version %1",Epoch_ServerVersion]; diag_log format["Epoch: Starting ArmA3 Epoch Server, Version %1",Epoch_ServerVersion];
@ -221,14 +224,14 @@ if (_dateChanged) then {
_config = 'CfgServicePoint' call EPOCH_returnConfig; _config = 'CfgServicePoint' call EPOCH_returnConfig;
_servicepoints = getArray (_config >> worldname >> 'ServicePoints'); _servicepoints = getArray (_config >> worldname >> 'ServicePoints');
{ {
_marker = createMarker [('ServicePointMarker'+(str _foreachindex)), _x]; _marker = createMarker [('ServicePointMarker'+(str _forEachIndex)), _x];
_marker setmarkertype "mil_dot"; _marker setmarkertype "mil_dot";
_marker setmarkercolor 'ColorBlack'; _marker setmarkercolor 'ColorBlack';
_marker setMarkerText ("Service Point"); _marker setMarkerText ("Service Point");
if !(surfaceiswater _x) then { if !(surfaceiswater _x) then {
"Land_HelipadCircle_F" createvehicle _x; "Land_HelipadCircle_F" createvehicle _x;
}; };
} forEach _ServicePoints; } forEach _servicepoints;
// set time multiplier // set time multiplier