Merge branch 'v0.96.6' into v0.96.6-zeus-param
This commit is contained in:
Christian
GitHub
commit
b67fa08efd
|
|
@ -611,12 +611,12 @@ box_transport_config = [
|
|||
["rhsusf_M1083A1P2_D_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]],
|
||||
["rhsusf_M1083A1P2_WD_flatbed_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]],
|
||||
["rhsusf_M1083A1P2_WD_fmtv_usarmy", -5.0, [0,-0.2,0.45], [0,-1.9,0.45]],
|
||||
["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.7], [0,-1.3,0.7], [0,-3,0.7]],
|
||||
["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.7], [0,-1.3,0.7], [0,-3,0.7]],
|
||||
["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
|
||||
["rhsusf_M977A4_BKIT_usarmy_wd", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
|
||||
["rhsusf_M977A4_usarmy_d", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
|
||||
["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,1.4], [0,-1.3,1.4], [0,-3,1.4]],
|
||||
["rhsusf_M977A4_BKIT_M2_usarmy_d", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]],
|
||||
["rhsusf_M977A4_BKIT_M2_usarmy_wd", -6.5, [0,0.4,0.1], [0,-1.3,0.1], [0,-3,0.1]],
|
||||
["rhsusf_M977A4_BKIT_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
|
||||
["rhsusf_M977A4_BKIT_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
|
||||
["rhsusf_M977A4_usarmy_d", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
|
||||
["rhsusf_M977A4_usarmy_wd", -6.5, [0,0.4,0.8], [0,-1.3,0.8], [0,-3,0.8]],
|
||||
["rhsusf_m998_d_2dr_halftop", -4.5, [0,-0.9,-0.2]],
|
||||
["rhsusf_m998_w_2dr_halftop", -4.5, [0,-0.9,-0.2]],
|
||||
["rhsusf_M1239_socom_d", -5, [-0.125,-1.73,-0.66], [0,-3.28,-0.66]],
|
||||
|
|
|
|||
|
|
@ -27,17 +27,20 @@ if (count GRLIB_all_fobs == 0) then {
|
|||
private _fobbox = objNull;
|
||||
|
||||
while {count GRLIB_all_fobs == 0} do {
|
||||
_fobbox = FOB_box_typename createVehicle (getposATL base_boxspawn);
|
||||
_fobbox = ([FOB_box_typename, FOB_truck_typename] select KP_liberation_fob_vehicle) createVehicle (getposATL base_boxspawn);
|
||||
_fobbox setdir getDir base_boxspawn;
|
||||
_fobbox setposATL (getposATL base_boxspawn);
|
||||
|
||||
_fobbox call F_setFobMass;
|
||||
clearWeaponCargoGlobal _fobbox;
|
||||
clearMagazineCargoGlobal _fobbox;
|
||||
clearBackpackCargoGlobal _fobbox;
|
||||
clearItemCargoGlobal _fobbox;
|
||||
// Add ViV actions to FOB Box
|
||||
[_fobBox] remoteExecCall ["F_setLoadableViV", 0, _fobBox];
|
||||
|
||||
if (!KP_liberation_fob_vehicle) then {
|
||||
_fobbox call F_setFobMass;
|
||||
// Add ViV actions to FOB Box
|
||||
[_fobBox] remoteExecCall ["F_setLoadableViV", 0, _fobBox];
|
||||
};
|
||||
|
||||
sleep 3;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
private _weathers = [
|
||||
[0.25],
|
||||
[0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55],
|
||||
[0, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1]
|
||||
[0, 0.1, 0.15, 0.2, 0.25, 0.3, 0.325, 0.35, 0.375, 0.4, 0.425, 0.45, 0.475, 0.5, 0.525, 0.55, 0.575, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1]
|
||||
] select (GRLIB_weather_param - 1);
|
||||
|
||||
private _newWeather = selectRandom _weathers;
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ if(isServer) then {
|
|||
GET_PARAM_BOOL(KP_liberation_mobilearsenal, "MobileArsenal", 1);
|
||||
GET_PARAM_BOOL(KP_liberation_arsenal_type, "ArsenalType", 0);
|
||||
GET_PARAM_BOOL(KP_liberation_fog_param, "VanillaFog", 1);
|
||||
GET_PARAM_BOOL(KP_liberation_fob_vehicle, "FirstFobVehicle", 0);
|
||||
|
||||
GET_PARAM_BOOL(GRLIB_adaptive_opfor, "AdaptToPlayercount", 1);
|
||||
GET_PARAM_BOOL(GRLIB_deployment_cinematic, "DeploymentCinematic", 1);
|
||||
|
|
@ -226,6 +227,10 @@ if (!isDedicated && hasInterface) then {
|
|||
_value = if (GRLIB_build_first_fob) then {localize "STR_YES";} else {localize "STR_NO";};
|
||||
_text = _text + format ["<font color='#ff8000'>%1</font><br />%2<br /><br />", _param, _value];
|
||||
|
||||
_param = localize "STR_PARAMS_FIRSTFOBVEHICLE";
|
||||
_value = if (KP_liberation_fob_vehicle) then {localize "STR_PARAMS_FIRSTFOBVEHICLE_TRUCK";} else {localize "STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER";};
|
||||
_text = _text + format ["<font color='#ff8000'>%1</font><br />%2<br /><br />", _param, _value];
|
||||
|
||||
_param = localize "STR_PARAM_FOBS_COUNT";
|
||||
_value = str GRLIB_maximum_fobs;
|
||||
_text = _text + format ["<font color='#ff8000'>%1</font><br />%2<br /><br />", _param, _value];
|
||||
|
|
|
|||
|
|
@ -6272,5 +6272,17 @@
|
|||
<Original>Dynamic fog (A3 Vanilla)</Original>
|
||||
<German>Dynamischer Nebel (A3 Vanilla)</German>
|
||||
</Key>
|
||||
<Key ID="STR_PARAMS_FIRSTFOBVEHICLE">
|
||||
<Original>Start FOB provided as</Original>
|
||||
<German>Start-FOB bereitgestellt als</German>
|
||||
</Key>
|
||||
<Key ID="STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER">
|
||||
<Original>FOB Container</Original>
|
||||
<German>FOB Container</German>
|
||||
</Key>
|
||||
<Key ID="STR_PARAMS_FIRSTFOBVEHICLE_TRUCK">
|
||||
<Original>FOB Truck</Original>
|
||||
<German>FOB LKW</German>
|
||||
</Key>
|
||||
</Package>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -54,6 +54,12 @@ class Params
|
|||
texts[] = { $STR_YES, $STR_NO };
|
||||
default = 0;
|
||||
};
|
||||
class FirstFobVehicle {
|
||||
title = $STR_PARAMS_FIRSTFOBVEHICLE;
|
||||
values[] = {0, 1};
|
||||
texts[] = {$STR_PARAMS_FIRSTFOBVEHICLE_CONTAINTER, $STR_PARAMS_FIRSTFOBVEHICLE_TRUCK};
|
||||
default = 0;
|
||||
};
|
||||
class MaximumFobs {
|
||||
title = $STR_PARAM_FOBS_COUNT;
|
||||
values[] = {3,5,7,10,15,20,26};
|
||||
|
|
|
|||
|
|
@ -191,9 +191,11 @@ class Missions
|
|||
* Added: [Swedish Forces Pack](https://steamcommunity.com/sharedfiles/filedetails/?id=826911897) transport configs. Thanks to [Dahlgren](https://github.com/Dahlgren)
|
||||
* Added: Parameter to enable/disable the vanilla A3 dynamic fog behavior. Default enabled, so `fucking_set_fog.sqf` isn't running by default.
|
||||
* Added: Parameter to enable/disable limitations on Zeus functionalities. Default enabled to keep old behaviour.
|
||||
* Added: Parameter to decide to start the campaign with a FOB container (default, like before) or a FOB truck.
|
||||
* Updated: Russian localization. Thanks to [DjHaski](https://github.com/DjHaski)
|
||||
* Tweaked: Initial FOB box doesn't have equipment in the inventory anmore.
|
||||
* Tweaked: Height check for mobile respawn now relies on `isTouchingGround` instead of z value of position.
|
||||
* Tweaked: Transport config heights on M977 vehicles. Thanks to [FishAI](https://github.com/FishAI)
|
||||
* Fixed: Potato 01 was created after server restart, even if there was one saved.
|
||||
* Fixed: Missing variable `stats_blufor_teamkills_by_players`. Also no separation between by players or not by players for teamkills anymore.
|
||||
* Fixed: Factory storages could disappear randomly on save load.
|
||||
|
|
|
|||
Loading…
Reference in New Issue