huashui
/
KP-Liberation
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fixes due to first testing

This commit is contained in:
Wyqer 2019-06-24 18:05:53 +02:00
parent 8d403ad2b5
commit ba7f52e29f
No known key found for this signature in database
GPG Key ID: D7E2F8BD7F1E48FA
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Missionframework/presets/init_presets.sqf
View File

@ -163,7 +163,7 @@ opfor_squad_8_tankkillers = [opfor_squad_leader,opfor_medic,opfor_machinegunner,
opfor_squad_8_airkillers = [opfor_squad_leader,opfor_medic,opfor_machinegunner,opfor_rpg,opfor_rpg,opfor_aa,opfor_aa,opfor_aa];
friendly_infantry_classnames = [];
{friendly_infantry_classnames pushBackUnique _x;} forEach (blufor_squad_inf_light + blufor_squad_inf + blufor_squad_at + blufor_squad_aa + blufor_squad_recon + blufor_squad_para);
{friendly_infantry_classnames pushBackUnique (_x select 0)};} forEach infantry_units;
{friendly_infantry_classnames pushBackUnique (_x select 0);} forEach infantry_units;
all_hostile_classnames = (land_vehicles_classnames + opfor_air + opfor_choppers + opfor_troup_transports + opfor_vehicles_low_intensity);
{land_vehicles_classnames pushback (_x select 0);} foreach (heavy_vehicles + light_vehicles);
air_vehicles_classnames = [] + opfor_choppers;

9
Missionframework/scripts/client/markers/sector_manager.sqf
View File

@ -1,12 +1,13 @@
waitUntil {!isNil "save_is_loaded"};
waitUntil {!isNil "GRLIB_vehicle_to_military_base_links"};
waitUntil {!isNil "blufor_sectors"};
private _vehicle_unlock_markers = [];
private _cfg = configFile >> "cfgVehicles";
{
params ["_vehicle", "_base"];
private _marker = createMarkerLocal [format ["vehicleunlockmarker%1",_base], [(markerpos _base) select 0, ((markerpos _base) select 1) + 125]];
_x params ["_vehicle", "_base"];
private _marker = createMarkerLocal [format ["vehicleunlockmarker%1", _base], [(markerpos _base) select 0, ((markerpos _base) select 1) + 125]];
_marker setMarkerTextLocal (getText (_cfg >> _vehicle >> "displayName"));
_marker setMarkerColorLocal GRLIB_color_enemy;
_marker setMarkerTypeLocal "mil_pickup";
@ -27,8 +28,8 @@ while {true} do {
{_x setMarkerColorLocal GRLIB_color_friendly;} forEach blufor_sectors;
{
params ["_marker", "_base"]
_marker setMarkerColorLocal [GRLIB_color_enemy, GRLIB_color_friendly] select (_base in blufor_sectors);
_x params ["_marker", "_base"];
_marker setMarkerColorLocal ([GRLIB_color_enemy, GRLIB_color_friendly] select (_base in blufor_sectors));
} forEach _vehicle_unlock_markers;
_sector_count = count blufor_sectors;
};

2
Missionframework/scripts/server/game/check_victory_conditions.sqf
View File

@ -37,7 +37,7 @@ if (count _blufor_bigtowns == count sectors_bigtown) then {
[publicstats] remoteExec ["remote_call_endgame"];
private _playtime_days = floor (stats_playtime / 86400); stats_playtime
private _playtime_days = floor (stats_playtime / 86400);
private _playtime_hours = floor ((stats_playtime % 86400) / 3600);
private _playtime_minutes = floor ((stats_playtime % 3600) / 60);
private _playtime_seconds = stats_playtime % 60;

12
Missionframework/scripts/server/game/save_manager.sqf
View File

@ -315,8 +315,8 @@ if (!isNil "greuh_liberation_savegame") then {
_object setPosWorld _pos;
_object setVectorDirAndUp [_vecDir, _vecUp];
// Add blufor crew, if it had crew
if (_hascrew) then {
// Add blufor crew, if it had crew or is a UAV
if ((unitIsUAV _object) || _hascrew) then {
[_object] call F_forceBluforCrew;
};
@ -430,7 +430,7 @@ if (!isNil "greuh_liberation_savegame") then {
// This will be removed if we reach a 0.96.7 due to more released Arma 3 DLCs until we finish 0.97.0
if (((greuh_liberation_savegame select 0) select 0) isEqualType 0) then {
{
params ["_spawnPos", "_units"];
_x params ["_spawnPos", "_units"];
private _grp = createGroup [GRLIB_side_friendly, true];
{
_x createUnit [[_spawnPos, _grp] select (_forEachIndex > 0), _grp, 'this addMPEventHandler ["MPKilled", {_this spawn kill_manager}]'];
@ -486,8 +486,8 @@ if ((_lockedVehCount < (count sectors_military)) && (_lockedVehCount < (count el
// Add new entries, when there are elite vehicles and military sectors are not yet assigned
while {((count _assignedVehicles) < (count elite_vehicles)) && ((count _assignedBases) < (count sectors_military))} do {
_nextVehicle = selectRandom (elite_vehicles - _assignedVehicles);
_nextBase = selectRandom (sectors_military - _assignedBases);
_nextVehicle = selectRandom (elite_vehicles - _assignedVehicles);
_nextBase = selectRandom (sectors_military - _assignedBases);
_assignedVehicles pushBack _nextVehicle;
_assignedBases pushBack _nextBase;
GRLIB_vehicle_to_military_base_links pushBack [_nextVehicle, _nextBase];
@ -544,7 +544,7 @@ while {true} do {
{!(_x getVariable ["KP_liberation_edenObject", false])} && // Exclude all objects placed via editor in mission.sqm
{!(_x getVariable ["KP_liberation_preplaced", false])} && // Exclude preplaced (e.g. little birds from carrier)
{!((typeOf _x) in KP_liberation_crates)} // Exclude storage crates (those are handled separately)
};
};
_allObjects = _allObjects + (_fobObjects select {!((typeOf _x) in KP_liberation_storage_buildings)});
_allStorages = _allStorages + (_fobObjects select {(_x getVariable ["KP_liberation_storage_type",-1]) == 0});

4
Missionframework/scripts/shared/functions/F_kp_fillStorage.sqf
View File

@ -1,6 +1,6 @@
params [
["_supply", 0, [0]],
["_ammo", 0 [0]],
["_ammo", 0, [0]],
["_fuel", 0, [0]],
["_storage", objNull, [objNull]],
["_delay", false, [false]]
@ -18,7 +18,7 @@ private _pos = getPos _storage;
while {_x > 0} do {
_amount = 100;
if (_x / 100) < 1) then {
if ((_x / 100) < 1) then {
_amount = _x;
};
_x = _x - _amount;