From 82eb2174444ba96d427d7fd073a2f75813b66268 Mon Sep 17 00:00:00 2001 From: Mike-MF Date: Sun, 2 Oct 2022 18:23:02 +0100 Subject: [PATCH] Minor Fixes (#167) Co-authored-by: JoramD0 --- .../functions/fn_featureOverview.sqf | 1 + .../functions/fn_initArsenalCrate.sqf | 17 ++++--- Olympus.Stratis/init.sqf | 36 ++++++++++----- Olympus.Stratis/initPlayerLocal.sqf | 3 ++ Olympus.Stratis/mission.sqm | 45 +++++++++---------- 5 files changed, 58 insertions(+), 44 deletions(-) diff --git a/Olympus.Stratis/functions/fn_featureOverview.sqf b/Olympus.Stratis/functions/fn_featureOverview.sqf index e5e5cd3..5140575 100644 --- a/Olympus.Stratis/functions/fn_featureOverview.sqf +++ b/Olympus.Stratis/functions/fn_featureOverview.sqf @@ -39,6 +39,7 @@ _player createDiaryRecord ["features", ["Chat Commands", "

#tac-cleanup:
Type `#tac-cleanup` in chat to delete any items on the ground in a 10m range. +
To extend the cleanup range type `#tac-cleanup ` in chat (number in meters between 1 and 100 meters).

#tac-grenade-reset:
Type `#tac-grenade-reset` in chat to reset the grenade building. diff --git a/Olympus.Stratis/functions/fn_initArsenalCrate.sqf b/Olympus.Stratis/functions/fn_initArsenalCrate.sqf index 69ee7fc..ee659bb 100644 --- a/Olympus.Stratis/functions/fn_initArsenalCrate.sqf +++ b/Olympus.Stratis/functions/fn_initArsenalCrate.sqf @@ -49,7 +49,7 @@ private _rangePistol = [ "ACE_EarPlugs", "V_Rangemaster_belt", "tacs_Walther_P99", - "16Rnd_9x21_Mag" + "tacgt_17Rnd_9x19mm_Walther_Ball" ]; private _rangeRifle = [ @@ -57,7 +57,7 @@ private _rangeRifle = [ "ACE_EarPlugs", "V_Rangemaster_belt", "CUP_arifle_M4A1_black", - "30Rnd_556x45_Stanag_green" + "tacgt_30Rnd_556x45_Ball_EMAG" ]; private _engineer = [ @@ -145,10 +145,9 @@ private _machineGun = [ "ACE_EarPlugs", "V_Rangemaster_belt", "hlc_m249_pip1", - "hlc_200rnd_556x45_M_SAW", - "bwa3_optic_compm2", + "tacgt_200Rnd_556x45_Ball_Belt", + "tacgt_200Rnd_556x45_Ball_Tracer_Belt", "cup_optic_elcanm145", - "bwa3_optic_zo4x30_microt2", "tacs_Backpack_Carryall_DarkBlack" ]; @@ -156,10 +155,10 @@ private _marksman = [ "ACE_fieldDressing", "ACE_EarPlugs", "arifle_MXM_Black_F", - "30Rnd_65x39_caseless_black_mag", + "tacgt_30Rnd_65x39_Ball_MX_Black", "optic_hamr", "srifle_DMR_03_F", - "20Rnd_762x51_Mag", + "tacgt_20Rnd_762x51_Ball", "optic_mrco", "ace_optic_mrco_2d", "tacs_EBR_Black_F", @@ -174,9 +173,9 @@ private _weaponsHandling = [ "ACE_EarPlugs", "V_Rangemaster_belt", "CUP_arifle_M4A1_black", - "30Rnd_556x45_Stanag_green", + "tacgt_30Rnd_556x45_Ball_EMAG", "tacs_Walther_P99", - "16Rnd_9x21_Mag" + "tacgt_17Rnd_9x19mm_Walther_Ball" ]; // Init stuff diff --git a/Olympus.Stratis/init.sqf b/Olympus.Stratis/init.sqf index 96d4cee..efbc461 100644 --- a/Olympus.Stratis/init.sqf +++ b/Olympus.Stratis/init.sqf @@ -1,8 +1,5 @@ #include "script_component.hpp" [{ - // Disable Ambient Animals - [{time > 0}, {enableEnvironment [false, false];}] call CBA_fnc_waitUntilAndExecute; - // Sets ACRE2 channel names { [_x, "default", "theseus"] call acre_api_fnc_copyPreset; @@ -22,32 +19,47 @@ // Environment Control Event Handlers [QGVAR(setTime), { ["Environment changing..."] call CBA_fnc_notify; - skipTime skipTime ((_this select 0) - daytime); // Skip forward to a specific time + + if (isServer) then { + skipTime ((_this select 0) - daytime); // Skip time (Server Execution) + }; forceWeatherChange; }] call CBA_fnc_addEventHandler; [QGVAR(setDate), { ["Environment changing..."] call CBA_fnc_notify; - setDate (_this select 0); // Set date - forceWeatherChange; + setDate (_this select 0); // Set date (Local Execution) + + if (isServer) then { + forceWeatherChange; + }; }] call CBA_fnc_addEventHandler; [QGVAR(setFog), { ["Environment changing..."] call CBA_fnc_notify; - 0 setFog (_this select 0); // Set fog - forceWeatherChange; + + if (isServer) then { + 0 setFog (_this select 0); // Set fog (Server Execution) + forceWeatherChange; + }; }] call CBA_fnc_addEventHandler; [QGVAR(setOvercast), { ["Environment changing..."] call CBA_fnc_notify; - 0 setOvercast (_this select 0); // Set overcast - forceWeatherChange; + 0 setOvercast (_this select 0); // Set overcast (Local Execution) + + if (isServer) then { + forceWeatherChange; + }; }] call CBA_fnc_addEventHandler; [QGVAR(setRain), { ["Environment changing..."] call CBA_fnc_notify; - 0 setRain (_this select 0); // Set rain - forceWeatherChange; + + if (isServer) then { + 0 setRain (_this select 0); // Set rain (Server Execution) + forceWeatherChange; + }; }] call CBA_fnc_addEventHandler; // Medical Event Handlers diff --git a/Olympus.Stratis/initPlayerLocal.sqf b/Olympus.Stratis/initPlayerLocal.sqf index 728d3f9..6dfab66 100644 --- a/Olympus.Stratis/initPlayerLocal.sqf +++ b/Olympus.Stratis/initPlayerLocal.sqf @@ -21,6 +21,9 @@ call FUNC(addChatCommands); + // Disable Ambient Animals + [{time > 0}, {enableEnvironment [false, true];}] call CBA_fnc_waitUntilAndExecute; + // Types "OLYMPUS" text on the screen, letter by letter, cursor blinking. [ [ diff --git a/Olympus.Stratis/mission.sqm b/Olympus.Stratis/mission.sqm index 732de34..513f5c8 100644 --- a/Olympus.Stratis/mission.sqm +++ b/Olympus.Stratis/mission.sqm @@ -5,7 +5,7 @@ class EditorData angleGridStep=0.2617994; scaleGridStep=100; autoGroupingDist=10; - toggles=586; + toggles=578; class ItemIDProvider { nextID=2593; @@ -16,14 +16,14 @@ class EditorData }; class LayerIndexProvider { - nextID=11218; + nextID=11346; }; class Camera { - pos[]={1830.7411,87.41507,3442.8489}; - dir[]={0.70859891,-0.5194416,0.47757328}; - up[]={0.4307456,0.85450399,0.29030851}; - aside[]={0.55888629,-3.2247044e-008,-0.82924765}; + pos[]={1878.9436,28.272432,3505.4109}; + dir[]={0.92180288,-0.29428497,0.25235593}; + up[]={0.28384304,0.95571786,0.077705562}; + aside[]={0.2640487,5.7742e-008,-0.9645142}; }; }; binarizationWanted=0; @@ -25661,7 +25661,7 @@ class Mission }; id=651; type="Land_Pallet_F"; - atlOffset=1.4483433; + atlOffset=1.448328; }; class Item10 { @@ -25679,7 +25679,7 @@ class Mission }; id=652; type="Land_Pallet_F"; - atlOffset=1.4487; + atlOffset=1.4486847; }; class Item11 { @@ -28089,8 +28089,8 @@ class Mission dataType="Object"; class PositionInfo { - position[]={5149.4331,61.707611,3728.9661}; - angles[]={0.084796004,3.2449675,5.9666939}; + position[]={5153.8164,75.543457,3646.8091}; + angles[]={0,3.2449675,0}; }; side="Empty"; flags=4; @@ -28100,59 +28100,58 @@ class Mission }; id=1784; type="TargetP_Inf3_F"; - atlOffset=0.15099716; }; class Item29 { dataType="Object"; class PositionInfo { - position[]={5145.0942,63.379959,3727.0164}; + position[]={5149.4775,77.911705,3644.8594}; angles[]={0.1046163,3.2449675,5.9332108}; }; side="Empty"; - flags=4; class Attributes { name="rangeMachineGunTarget12"; }; id=1785; type="TargetP_Inf3_F"; - atlOffset=0.10800171; + atlOffset=2.3685837; }; class Item30 { dataType="Object"; class PositionInfo { - position[]={5155.9854,60.078773,3729.4272}; + position[]={5160.3687,75.509094,3647.2703}; angles[]={0,3.2449675,0}; }; side="Empty"; + flags=4; class Attributes { name="rangeMachineGunTarget14"; }; id=1786; type="TargetP_Inf3_F"; - atlOffset=0.9280014; }; class Item31 { dataType="Object"; class PositionInfo { - position[]={5159.2744,59.221451,3728.7441}; + position[]={5163.6577,73.753197,3646.5872}; angles[]={0,3.2509365,0}; }; side="Empty"; + flags=4; class Attributes { name="rangeMachineGunTarget15"; }; id=1787; type="TargetP_Inf3_F"; - atlOffset=1.4070015; + atlOffset=-0.58180237; }; class Item32 { @@ -28334,7 +28333,7 @@ class Mission }; }; id=1774; - atlOffset=1.7415009; + atlOffset=1.7561646; }; class Item2 { @@ -29044,7 +29043,7 @@ class Mission dataType="Object"; class PositionInfo { - position[]={5154.9443,60.706135,3727.4651}; + position[]={5159.3276,75.237877,3645.3081}; angles[]={0,3.1433196,0}; }; side="Empty"; @@ -29055,7 +29054,7 @@ class Mission }; id=1783; type="Land_d_Stone_HouseSmall_V1_F"; - atlOffset=-3.8146973e-006; + atlOffset=-0.7359314; }; class Item27 { @@ -29093,7 +29092,7 @@ class Mission }; }; id=1776; - atlOffset=50.090897; + atlOffset=58.383324; }; class Item4 { @@ -29259,7 +29258,7 @@ class Mission }; }; id=1772; - atlOffset=24.48056; + atlOffset=24.912323; }; class Item9 {