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

Some small tweaks and updated README.md

This commit is contained in:
Christian 2017-10-06 08:13:32 +02:00
parent 6ac1b20120
commit 87230e426e
9 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Missionframework/init.sqf
View File

@ -32,7 +32,8 @@ if (!isDedicated && !hasInterface && isMultiplayer) then {
};
if (!isDedicated && hasInterface) then {
waitUntil { alive player };
waitUntil {alive player};
if (debug_source != name player) then {debug_source = name player};
[] call compileFinal preprocessFileLineNumbers "scripts\client\init_client.sqf";
} else {
setViewDistance 1600;

8
Missionframework/scripts/client/init_client.sqf
View File

@ -26,6 +26,8 @@ spawn_camera = compileFinal preprocessFileLineNumbers "scripts\client\spawn\spaw
cinematic_camera = compileFinal preprocessFileLineNumbers "scripts\client\ui\cinematic_camera.sqf";
write_credit_line = compileFinal preprocessFileLineNumbers "scripts\client\ui\write_credit_line.sqf";
do_load_box = compileFinal preprocessFileLineNumbers "scripts\client\ammoboxes\do_load_box.sqf";
kp_fuel_consumption = compileFinal preprocessFileLineNumbers "scripts\client\misc\kp_fuel_consumption.sqf";
kp_cr_checkVehicle = compileFinal preprocessFileLineNumbers "scripts\client\civrep\kp_cr_checkVehicle.sqf";
[] spawn compileFinal preprocessFileLineNumbers "scripts\client\actions\action_manager.sqf";
[] spawn compileFinal preprocessFileLineNumbers "scripts\client\actions\intel_manager.sqf";
@ -59,9 +61,9 @@ if (!KP_liberation_ace) then {[] spawn compileFinal preprocessFileLineNumbers "s
[] spawn compileFinal preprocessFileLineNumbers "scripts\client\ui\tutorial_manager.sqf";
[] spawn compileFinal preprocessFileLineNumbers "scripts\client\markers\update_production_sites.sqf";
player addMPEventHandler ["MPKilled", {_this spawn kill_manager}];
player addEventHandler ["GetInMan", {[_this select 2] execVM "scripts\client\misc\kp_fuel_consumption.sqf";}];
player addEventHandler ["GetInMan", {[_this select 2] execVM "scripts\client\civrep\kp_cr_checkVehicle.sqf";}];
player addMPEventHandler ["MPKilled", {_this spawn kill_manager;}];
player addEventHandler ["GetInMan", {[_this select 2] spawn kp_fuel_consumption;}];
player addEventHandler ["GetInMan", {[_this select 2] spawn kp_cr_checkVehicle;}];
{
[_x] call BIS_fnc_drawCuratorLocations;

12
Missionframework/scripts/client/misc/kp_fuel_consumption.sqf
View File

@ -17,17 +17,13 @@ Example for initPlayerLocal.sqf:
player addEventHandler ["GetInMan", {[ _this select 2] execVM "scripts\kp_fuel_consumption.sqf";}];
*/
private ["_kp_neutral_consumption","_kp_normal_consumption","_kp_max_consumption"];
/*
CONFIG
*/
//CONFIG
// Time in Minutes till a full tank depletes when the vehicle is standing with running engine
_kp_neutral_consumption = KP_liberation_fuel_neutral;
private _kp_neutral_consumption = KP_liberation_fuel_neutral;
// Time in Minutes till a full tank depletes when the vehicle is driving
_kp_normal_consumption = KP_liberation_fuel_normal;
private _kp_normal_consumption = KP_liberation_fuel_normal;
// Time in Minutes till a full tank depletes when the vehicle is driving at max speed
_kp_max_consumption = KP_liberation_fuel_max;
private _kp_max_consumption = KP_liberation_fuel_max;
/*
DO NOT EDIT BELOW

4
Missionframework/scripts/server/base/startgame.sqf
View File

@ -26,8 +26,10 @@ if (count GRLIB_all_fobs == 0) then {
if (KP_liberation_debug) then {private _text = format ["[KP LIBERATION] [DEBUG] Preplaced FOB placed by: %1", debug_source];_text remoteExec ["diag_log",2];};
} else {
private _fobbox = objNull;
while {count GRLIB_all_fobs == 0} do {
private _fobbox = FOB_box_typename createVehicle (getposATL base_boxspawn);
_fobbox = FOB_box_typename createVehicle (getposATL base_boxspawn);
_fobbox setposATL (getposATL base_boxspawn);
_fobbox setdir getDir base_boxspawn;

28
Missionframework/scripts/server/civrep/fnc/f_kp_cr_liberatedSector.sqf
View File

@ -1,25 +1,25 @@
params ["_sector"];
if (KP_liberation_civrep_debug > 0) then {private _text = format ["[KP LIBERATION] [CIVREP] liberatedSector called on: %1 - Sector: %2", debug_source, _sector];_text remoteExec ["diag_log",2];};
private _penalty = 0;
if (_sector in sectors_bigtown || _sector in sectors_capture) then {
if (KP_liberation_civrep_debug > 0) then {diag_log format ["[KP LIBERATION] [CIVREP] liberatedSector called at: %1 - Sector: %2", time, markerText _sector];};
private _penalty = 0;
{
if (_sector == (_x select 0)) exitWith {_penalty = (_x select 1) - ([_sector] call F_cr_getBuildings)};
} forEach KP_liberation_cr_sectorbuildings;
_penalty = _penalty * KP_liberation_cr_building_penalty;
};
if (_penalty > 0) then {
[1, [(_penalty / KP_liberation_cr_building_penalty)]] remoteExec ["F_cr_penaltyMsg"];
};
if (_penalty > 0) then {
[1, [(_penalty / KP_liberation_cr_building_penalty)]] remoteExec ["F_cr_penaltyMsg"];
};
if (_sector in sectors_bigtown) then {
[(2 * KP_liberation_cr_sector_gain - _penalty), false] spawn F_cr_changeCR;
} else {
[(KP_liberation_cr_sector_gain - _penalty), false] spawn F_cr_changeCR;
};
if (_sector in sectors_bigtown) then {
[(2 * KP_liberation_cr_sector_gain - _penalty), false] spawn F_cr_changeCR;
} else {
[(KP_liberation_cr_sector_gain - _penalty), false] spawn F_cr_changeCR;
};
if (KP_liberation_civrep_debug > 0) then {private _text = format ["[KP LIBERATION] [CIVREP] liberatedSector finished on: %1 - Penalty: %2", debug_source, _penalty];_text remoteExec ["diag_log",2];};
if (KP_liberation_civrep_debug > 0) then {diag_log format ["[KP LIBERATION] [CIVREP] liberatedSector finished at: %1 - Penalty: %2", time, _penalty];};
};

21
Missionframework/scripts/server/remotecall/sector_liberated_remote_call.sqf
View File

@ -2,31 +2,30 @@ if (isServer) then {
params ["_liberated_sector"];
_combat_readiness_increase = 0;
private _combat_readiness_increase = 0;
if ( _liberated_sector in sectors_bigtown ) then {
if (_liberated_sector in sectors_bigtown) then {
_combat_readiness_increase = (floor (random 10)) * GRLIB_difficulty_modifier;
};
if ( _liberated_sector in sectors_capture ) then {
if (_liberated_sector in sectors_capture) then {
_combat_readiness_increase = (floor (random 6)) * GRLIB_difficulty_modifier;
};
if ( _liberated_sector in sectors_military ) then {
if (_liberated_sector in sectors_military) then {
_combat_readiness_increase = (5 + (floor (random 11))) * GRLIB_difficulty_modifier;
};
if ( _liberated_sector in sectors_factory ) then {
if (_liberated_sector in sectors_factory) then {
_combat_readiness_increase = (3 + (floor (random 7))) * GRLIB_difficulty_modifier;
};
if ( _liberated_sector in sectors_tower ) then {
if (_liberated_sector in sectors_tower) then {
_combat_readiness_increase = (floor (random 4));
};
combat_readiness = combat_readiness + _combat_readiness_increase;
if ( combat_readiness > 100.0 && GRLIB_difficulty_modifier <= 2.0 ) then { combat_readiness = 100.0 };
if (combat_readiness > 100.0 && GRLIB_difficulty_modifier <= 2.0) then {combat_readiness = 100.0};
stats_readiness_earned = stats_readiness_earned + _combat_readiness_increase;
[_liberated_sector, 0] remoteExec ["remote_call_sector"];
@ -71,9 +70,9 @@ if (isServer) then {
sleep 45;
if ( GRLIB_endgame == 0 ) then {
if ( (!( _liberated_sector in sectors_tower )) && (((random (200.0 / (GRLIB_difficulty_modifier * GRLIB_csat_aggressivity) )) < (combat_readiness - 20)) || ( _liberated_sector in sectors_bigtown )) && ([] call F_opforCap < GRLIB_battlegroup_cap) ) then {
[ _liberated_sector ] spawn spawn_battlegroup;
if (GRLIB_endgame == 0) then {
if ((!(_liberated_sector in sectors_tower)) && (((random (200.0 / (GRLIB_difficulty_modifier * GRLIB_csat_aggressivity))) < (combat_readiness - 20)) || (_liberated_sector in sectors_bigtown)) && ([] call F_opforCap < GRLIB_battlegroup_cap)) then {
[_liberated_sector] spawn spawn_battlegroup;
};
};
};

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

@ -1,6 +1,6 @@
params ["_msgType",["_data",[]]];
if (KP_liberation_civrep_debug > 0) then {private _text = format ["[KP LIBERATION] [CIVREP] penaltyMsg calles on: %1 - Parameters: [%2, %3]", debug_source, _msgType, _data];_text remoteExec ["diag_log",2];};
if (KP_liberation_civrep_debug > 0) then {private _text = format ["[KP LIBERATION] [CIVREP] penaltyMsg called on: %1 - Parameters: [%2, %3]", debug_source, _msgType, _data];_text remoteExec ["diag_log",2];};
switch (_msgType) do {
case 0: {systemChat localize "STR_CR_VEHICLEMSG";};
@ -8,5 +8,3 @@ switch (_msgType) do {
case 2: {systemChat (format [localize "STR_CR_KILLMSG", (_data select 0)]);};
default {private _text = format ["[KP LIBERATION] [ERROR] [CIVREP] penaltyMsg without valid msgType"];_text remoteExec ["diag_log",2];};
};
if (KP_liberation_civrep_debug > 0) then {private _text = format ["[KP LIBERATION] [CIVREP] penaltyMsg finished on: %1", debug_source];_text remoteExec ["diag_log",2];};

2
Missionframework/stringtable.xml
View File

@ -1628,7 +1628,7 @@
<Key ID="STR_RESUPPLY_TOOLTIP">
<Original>If the selected squad member is close enough from a resupply point (mobile spawn or FOB) they will get a brand new, full loadout.</Original>
<French>Si le membre d'escouade sélectionné est assez près d'un point d'approvisionnement (spawn mobile ou FOB) il recevra un nouvel équipement complet.</French>
<German>Wenn das gewählte Gruppenmitglied nahe genug bei einem Versorgungspunkt (mobiler Spawn oder FOB)ist, erhält es eine brandneue, vollständige Ausrüstung</German>
<German>Wenn das gewählte Gruppenmitglied nahe genug bei einem Versorgungspunkt (mobiler Spawn oder FOB) ist, erhält es eine brandneue, vollständige Ausrüstung</German>
<Spanish>Si el miembro de la escuadra se encuentra cerca de un punto de abastecimiento (spawn móvil o FOB) obtendrá el equipamiento completo nuevo</Spanish>
<Russian>Если выбранный член группы находится достаточно близко от точки пополнения запасов (мобильный КШМ или FOB), он будет заменён новым, полностью снаряжённым.</Russian>
<Italian>Se il membro di una squadra è nei pressi di una FOB o Respwan Mobile potrà ricaricare il suo loadout.</Italian>

6
README.md
View File

@ -184,6 +184,9 @@ class Missions
* Added: Automatic server restart script for dedicated servers. Thanks to [k4s0](https://github.com/k4s0)
* Added: Settings in the mission parameters for particular debug messages.
* Added: Factory map markers now indicate which production facilities are available there.
* Added: LoW Civilians.
* Added: LoW UAVs to the default blacklist.
* Added: Some of the new RHS vehicles.
* Removed: Liberation skill handling of AI units, as BI do this good enough now concerning wounds, etc.
* Removed: Vehicle explosion chance script for convoy ambush.
* Tweaked: Terrain alignment will be persistent during repeat building of objects (like walls). Thanks to [veteran29](https://github.com/veteran29)
@ -197,6 +200,8 @@ class Missions
* Tweaked: IED count in cities, capitals and factories is now dependend on the civil reputation.
* Tweaked: Corrected some strings in the stringtable.
* Tweaked: Factories don't have all facilities from the start anymore. The facility they start with is set at campaign start.
* Tweaked: Replaced all deprecated `BIS_fnc_selectRandom` with the engine solution `selectRandom`.
* Tweaked: Server log will now contain the `[STATS]` message of all clients. (players and HCs)
* Fixed: Player got custom recoil and aiming coefficients on respawn.
* Fixed: Rare script error on closing respawn screen directly after joining the mission.
* Fixed: Players could deploy multiple FOBs when they selected deploy fast enough on the same container.
@ -207,6 +212,7 @@ class Missions
* Fixed: Paratroopers got sometimes an attack helicopter instead of a transport helicopter.
* Fixed: Rescue helipad blocked building in their near vicinity.
* Fixed: MPKill Eventhandler issue when using ACE.
* Fixed: Function to buy a logistic truck worked but caused an error in dedicated server environment.
### 0.955 (24th June 2017)
* Added: Some small aesthetic things for the buildlist