Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.96.8 Config file organized and unified prefix #783

Merged
merged 7 commits into from
May 11, 2020
Merged

0.96.8 Config file organized and unified prefix #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cf850ac
WIP state of config organizing
Wyqer May 10, 2020
3c3307e
Organized config file
Wyqer May 10, 2020
24dc898
`GRLIB_` prefix to `KPLIB_`
Wyqer May 10, 2020
9e5937c
`KP_liberation_` prefix to `KPLIB_`
Wyqer May 10, 2020
5666f79
Update Changelog
Wyqer May 10, 2020
e6a8641
Adjust description.ext maxPlayers to count HCs
Wyqer May 10, 2020
040921e
Reorganized arsenal presets and preset variables
Wyqer May 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 0.96.8 (TBD)
* Tweaked: Splitted the config file in seperate files, as it was getting quite big.
* Tweaked: Unified the prefix of all variables to `KPLIB_`.
* Tweaked: Arsenal presets are now in the presets folder.
* Tweaked: Blacklist and arsenal extension are now own files in presets/arsenal.
* Tweaked: Renamed blufor/opfor to players/enemies, to possibly avoid further confusion with using an opfor faction for a player preset.
* Fixed: Description.ext stated 34 players while there are also 3 additional HC slots, so 37 in total.

## 0.96.7 (2020-05-10)
* Added: CfgFunctions library created from `shared/functions` and all of these functions optimized.
* Added: Mines and explosives will be saved around FOBs.
Expand Down
4 changes: 2 additions & 2 deletions Missionframework/KPLIB_debriefs.hpp → Missionframework/CfgDebriefing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
File: KPLIB_debriefs.hpp
File: CfgDebriefing.hpp
Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
Date: 2020-05-09
Last Update: 2020-05-09
Last Update: 2020-05-10
License: MIT License - http://www.opensource.org/licenses/MIT

Description:
Expand Down
8 changes: 4 additions & 4 deletions Missionframework/GREUH/Scripts/GREUH_cache_units.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ waitUntil { !isNil "nametags_distance" };

while { true } do {

_scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == GRLIB_side_friendly ) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ allUnits, { ( alive _x ) && ( side group _x == KPLIB_side_friendly ) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ _scanned_units, { (_x == leader group player ) || (_x distance player < nametags_distance) } ] call BIS_fnc_conditionalSelect;
_scanned_units = [ _scanned_units, { (_x != player) && (( vehicle player ) != ( vehicle _x )) } ] call BIS_fnc_conditionalSelect;
GRLIB_nametag_units = [] + _scanned_units;
KPLIB_nametag_units = [] + _scanned_units;

_scanned_groups = [ allGroups, { ( side _x == side player ) && ( isplayer (leader _x) ) } ] call BIS_fnc_conditionalSelect;
_scanned_groups = [ _scanned_groups, { ( count units _x > 1 ) || ( count units _x == 1 && leader _x != player ) } ] call BIS_fnc_conditionalSelect;
GRLIB_overlay_groups = [] + _scanned_groups;
KPLIB_overlay_groups = [] + _scanned_groups;

sleep 1;
};
};
10 changes: 5 additions & 5 deletions Missionframework/GREUH/Scripts/GREUH_platoonoverlay.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ nametags_distance = 32.0;

private [ "_groups", "_unitstocount", "_totalx", "_totaly", "_totalz", "_alpha", "_textalpha", "_size", "_screenpos", "_grouppos", "_distlabel", "_dist", "_nextunit", "_color", "_drawicon", "_displayname", "_iconpos" ];

waitUntil { !isNil "GRLIB_overlay_groups" };
waitUntil { !isNil "GRLIB_nametag_units" };
waitUntil { !isNil "KPLIB_overlay_groups" };
waitUntil { !isNil "KPLIB_nametag_units" };

["platoon_overlay", "onEachFrame", {

Expand Down Expand Up @@ -73,7 +73,7 @@ waitUntil { !isNil "GRLIB_nametag_units" };
drawIcon3D [platoon_icon1, _color, _grouppos, _size / 2, _size / 2,0, format ["%1 - %2%3",groupID _x, name (leader _x),_distlabel], 2, 0.03 * _textalpha, "puristaMedium"];
drawIcon3D [platoon_icon2, _color, _grouppos, _size, _size,0, "", 2, 0.04, "puristaMedium"];
};
} foreach GRLIB_overlay_groups;
} foreach KPLIB_overlay_groups;
};

if ( show_nametags ) then {
Expand All @@ -92,7 +92,7 @@ waitUntil { !isNil "GRLIB_nametag_units" };
_color = [];
if ( _nextunit in (units group player)) then {

switch ( _nextunit getVariable [ "GRLIB_squad_color", "MAIN" ] ) do {
switch ( _nextunit getVariable [ "KPLIB_squad_color", "MAIN" ] ) do {
case "BLUE" : { _color = [0.15,0.35,1.0,_alpha] };
case "RED" : { _color = [0.8,0,0,_alpha] };
case "YELLOW" : { _color = [0.85,0.85,0,_alpha] };
Expand Down Expand Up @@ -133,7 +133,7 @@ waitUntil { !isNil "GRLIB_nametag_units" };

drawIcon3D [ _drawicon, _color, _iconpos , 0.75, 0.75,0, format [ "%1", _displayname] , 2, 0.032, "puristaMedium"];

} foreach GRLIB_nametag_units;
} foreach KPLIB_nametag_units;
};

}] call BIS_fnc_addStackedEventHandler;
6 changes: 3 additions & 3 deletions Missionframework/GREUH/Scripts/GREUH_playermarkers.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ private _color = "";
private _ticks = 0;
private _cfg = configFile >> "cfgVehicles";

if ( side player == GRLIB_side_friendly ) then {
_color = GRLIB_color_friendly;
if ( side player == KPLIB_side_friendly ) then {
_color = KPLIB_color_friendly;
} else {
_color = GRLIB_color_enemy;
_color = KPLIB_color_enemy;
};

while { true } do {
Expand Down
Loading