Skip to content

Commit

Permalink
Stability imporovements, temp disabled AT Mine Event
Browse files Browse the repository at this point in the history
  • Loading branch information
theace0296 committed Sep 26, 2021
1 parent 84eee68 commit e65434b
Show file tree
Hide file tree
Showing 55 changed files with 732 additions and 881 deletions.
4 changes: 2 additions & 2 deletions RandFramework/Client/camera/fn_missionOverAnimation.sqf
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// private _fnc_scriptName = "TRGM_CLIENT_fnc_missionOverAnimation";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


sleep 60;
waituntil {sleep 30; TRGM_VAR_AllInitScriptsFinished};
waitUntil {sleep 30; TRGM_VAR_AllInitScriptsFinished};
sleep 60;
private _bEnd = false;
while {!_bEnd} do {
private _bMissionEndedAndPlayersOutOfAO = false;
Expand Down
4 changes: 2 additions & 2 deletions RandFramework/GUI/fn_handleNotification.sqf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// private _fnc_scriptName = "TRGM_GUI_fnc_handleNotification";
// Adds a new notification to notification list

params [["_text", ""], ["_duration", 5], ["_priority", 5], ["_notificationIndex", -1], ["_condition", {true}]];
if (_text isEqualTo "") exitWith {};
params ["_text", ["_duration", 5], ["_priority", 5], ["_notificationIndex", -1], ["_condition", {true}]];
if (isNil "_text" || {_text isEqualTo ""}) exitWith {};
if (isDedicated || !hasInterface) exitWith {};

disableSerialization;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_addPlayerActionPersistent";
params ["_action"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_animateAnimals.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_animateAnimals";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_callNearbyPatrol.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ params [
["_thisThis", objNull],
["_thisThisList", []]
];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_callUAVFindObjective.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_callUAVFindObjective";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


params ["_missionObjective"];
Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_carryAndJoinWounded.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_carryAndJoinWounded";
params ["_civ", "_player"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
3 changes: 1 addition & 2 deletions RandFramework/Global/common/fn_createUnit.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_createUnit";
params [["_group", grpNull, [grpNull]], ["_type", nil, [""]], ["_position", nil, [nil, objNull, grpNull, []]], ["_markers", [], [[]]], ["_placement", 0, [0]], ["_special", "NONE", [""]], ["_disableDynamicShowHide", false, [false]]];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down Expand Up @@ -137,7 +136,7 @@ if !(_type isEqualTo _tempUnitType) then {
};

if (_unit isEqualTo leader _group && !_disableDynamicShowHide) then {
[_unit] spawn TRGM_GLOBAL_fnc_dynamicShowHide;
// [_unit] spawn TRGM_GLOBAL_fnc_dynamicShowHide;
};

_unit;
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_debugDotMarker.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_debugDotMarker";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


params ["_sText", "_pos"];
Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_deleteTrash.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_deleteTrash";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_dynamicShowHide.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_dynamicShowHide";
params ["_object"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_enemyAirSupport.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_enemyAirSupport";
params ["_SpottedPos", "_IsAirType"];// 1=AirToAir, 2=AirToGround, 3=Scout
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_fireAOFlares.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_fireAOFlares";
params ["_Pos"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_fireIllumFlares.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_fireIllumFlares";
params ["_player"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_getUnitType.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_getUnitType";
params [["_type", "", [""]]];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_hideTerrainObjects.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#define CATEGORY_COMP [MAP_TYPES_BUILDING,MAP_TYPES_WALL,MAP_TYPES_VEGETATION,MAP_TYPES_MISC]

params ["_pos", "_radius", ["_excludes", []], ["_types", CATEGORIES, [[]]]];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_initAmmoBox.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
*/

params [["_box", objNull, [objNull]], ["_units", []]];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_isAceLoaded.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_isAceLoaded";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


isClass(configFile >> "CfgPatches" >> "ace_main");
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_isCbaLoaded.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_isCbaLoaded";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


isClass(configFile >> "CfgPatches" >> "cba_main");
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_makeNPC.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_makeNPC";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


params ["_units"];
Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_nvScript.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

// If you make any improvments to this script try to tell me! I know there are things you can improve since I just started scripting 4 days before I finished this and if you manage to make a better version I wanna use it

format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


if (isDedicated) exitWith {};
Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_pushObject.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_pushObject";
params ["_Object", "", "_id", ""];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_reinforcements.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ _nul = [SIDE, "string", "string", number, bool, bool, bool, bool, bool, bool, bo
_nul = [EAST, "spawnMrk", "LZMrk", 2, true, true, true, true, false, false, false] spawn TRGM_GLOBAL_fnc_reinforcements; <<
---------------------------------------------------------------------------------------------------------*/
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_setCustomLoadout.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_setCustomLoadout";
params [["_unit", objNull, [objNull]], ["_type", "", [""]]];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_setLoadout.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_setLoadout";
params [["_unit", objNull, [objNull]], ["_type", "", [""]]];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_setMilitiaSkill.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_setMilitiaSkill";
//Not used... may consider settings this for militia units???
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


private _Unit = _this select 0;
Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_showIntel.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_showIntel";
params ["_AllowedIntelToShow", "_FoundViaType"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_supplyHelicopter.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_supplyHelicopter";
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;


params ["_finishedVariable", "_finishedValue", "_side", "_spawnPos", "_exitPos", "_destPos", "_unit"];
Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/common/fn_unloadDingy.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_unloadDingy";
params ["_target", "", "_id", ""];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



Expand Down
4 changes: 0 additions & 4 deletions RandFramework/Global/location/fn_addToDirection.sqf
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_addToDirection";

params ["_origDirection","_addToDirection"];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



if (isNil "_origDirection" || isNil "_addToDirection") exitWith {};

Expand Down
4 changes: 0 additions & 4 deletions RandFramework/Global/location/fn_directionToText.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ params [
["_words",false,[false]] // use word style instead of acronyms
];

format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



if (_direction < 0 ||_direction > 360) exitWith { ""; };

private _val = round(_direction/45);
Expand Down
4 changes: 0 additions & 4 deletions RandFramework/Global/location/fn_findSafePos.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ params [
["_object", "C_Quadbike_01_F", [objNull, ""]]
];

format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



switch (typeName _object) do {
case ("OBJECT") : {_object = typeOf _object};
};
Expand Down
3 changes: 0 additions & 3 deletions RandFramework/Global/location/fn_getLocationName.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ params[
["_useAtLocation",false],
["_distanceConsideredInArea",400]
];
format["%1 called by %2 on %3", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;



if (isNil "_location") exitWith { ""; };

Expand Down
1 change: 0 additions & 1 deletion RandFramework/Global/location/fn_randomPosIntersection.sqf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_randomPosIntersection";
scriptname "BIS_fnc_randomPosIntersection";
/*
Author: Riccardo Argiolas
Expand Down
16 changes: 12 additions & 4 deletions RandFramework/Global/logging/fn_populateLoadingWait.sqf
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
// private _fnc_scriptName = "TRGM_GLOBAL_fnc_populateLoadingWait";

params ["_percentage", ["_useCampaignLoading", false]];
if (isNil "TRGM_VAR_PopulateLoadingWait_percentage") then { TRGM_VAR_PopulateLoadingWait_percentage = 0; publicVariable "TRGM_VAR_PopulateLoadingWait_percentage"; };

private _coreCountSleep = 0.1;
sleep _coreCountSleep;
if !(isServer) exitWith {};

sleep 0.1;

if (TRGM_VAR_PopulateLoadingWait_percentage > 100) exitWith {};

TRGM_VAR_PopulateLoadingWait_percentage = 5 + TRGM_VAR_PopulateLoadingWait_percentage;
if (TRGM_VAR_PopulateLoadingWait_percentage >= 100) then {
TRGM_VAR_PopulateLoadingWait_percentage = 100;
};

if !(isNil "_percentage") then {
TRGM_VAR_PopulateLoadingWait_percentage = _percentage;
};

TRGM_VAR_PopulateLoadingWait_percentage = ceil(TRGM_VAR_PopulateLoadingWait_percentage);
publicVariable "TRGM_VAR_PopulateLoadingWait_percentage";

[format["Generating mission please wait... %1 percent", TRGM_VAR_PopulateLoadingWait_percentage], {TRGM_VAR_PopulateLoadingWait_percentage <= 100}, 100] call TRGM_GLOBAL_fnc_notifyGlobal;
private _message = ["Generating mission please wait...", "Generating new mission please wait..."] select (_useCampaignLoading);

[format["%1 %2 percent", _message, TRGM_VAR_PopulateLoadingWait_percentage], {TRGM_VAR_PopulateLoadingWait_percentage <= 100}, 100] call TRGM_GLOBAL_fnc_notifyGlobal;

if (TRGM_VAR_PopulateLoadingWait_percentage >= 100) then {
TRGM_VAR_PopulateLoadingWait_percentage = 101; publicVariable "TRGM_VAR_PopulateLoadingWait_percentage";
Expand Down
3 changes: 2 additions & 1 deletion RandFramework/Missions/hvtMission.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,11 @@ MISSION_fnc_CustomMission = { //This function is the main script for your missio
sleep 5; //allow five seconds for any scripts to be run on officer before he moves e.g. if set as hostage when friendly rebels)

while {alive(_objMan) && {behaviour _objMan isEqualTo "SAFE"}} do {
[_objManName,_thisInitPos,_objMan,75] spawn TRGM_SERVER_fnc_hvtWalkAround;
private _walkAroundHandle = [_objManName,_thisInitPos,_objMan,75] spawn TRGM_SERVER_fnc_hvtWalkAround;
sleep 2;
waitUntil {sleep 1; speed _objMan < 0.5};
sleep 10;
waitUntil { sleep 1; scriptDone _walkAroundHandle; };
};
};
[_sInformant1Name,_initPos] spawn TRGM_LOCAL_fnc_walkingGuyLoop;
Expand Down
Loading

0 comments on commit e65434b

Please sign in to comment.