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.9.2 Release Build #568

Merged
merged 3 commits into from
Aug 28, 2021
Merged

0.9.2 Release Build #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dd2793
Fix #563 : Switched to PositionASL instead of AGL when spawning loot
Ansible2 Aug 28, 2021
557c11d
Improved mission parameter menu save and load interactions
Ansible2 Aug 28, 2021
fdfd5b5
Merge pull request #567 from Ansible2/Misc-Fixes-For-0.9.1
Ansible2 Aug 28, 2021
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
6 changes: 3 additions & 3 deletions Functions/Waves/fn_spawnLoot.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ private _exit = false;
if (count _sortedPositions >= MAX_SPAWNS_PLUS_UNIQUES) then {_exit = true; break};

if (_forEachIndex isEqualTo 0 OR {(_forEachIndex mod BLWK_loot_roomDistribution) isEqualTo 0}) then {
_sortedPositions pushBack (_x vectorAdd [0,0,LOOT_HOLDER_Z_BUFFER]);
_sortedPositions pushBack (AGLToASL (_x vectorAdd [0,0,LOOT_HOLDER_Z_BUFFER]));
};
} forEach _buildingsPositions;
};
Expand Down Expand Up @@ -312,7 +312,7 @@ private _fn_addLoot = {
_selectedItemClass = selectRandom BLWK_loot_weaponClasses;
_magazineClass = [_selectedItemClass] call _fn_findAMagazine;
// if weapon has mags capable of spawning
if (_magazineClass != "") then {
if (_magazineClass isNotEqualTo "") then {
_holder addMagazineCargoGlobal [_magazineClass,round random [1,2,3]];
};

Expand All @@ -328,7 +328,7 @@ private _fn_addLoot = {
};

BLWK_lootHolders apply {
_x setPos (call _fn_getASpawnPosition);
_x setPosASL (call _fn_getASpawnPosition);

private _primaryLootClass = [_x] call _fn_addLoot;
// used for displaying loot markers in BLWK_fnc_createLootMarkers
Expand Down
22 changes: 18 additions & 4 deletions ...ystems/KISKA Parameter Menu/Functions/OnLoad/fn_paramsMenu_onLoad_saveAndLoadControls.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ _saveButton_ctrl ctrlAddEventHandler ["ButtonClick",{

private _saveAsButton_ctrl = _paramsMenuDisplay displayCtrl PARAMS_MENU_SAVEAS_BUTTON_IDC;
_saveAsButton_ctrl ctrlAddEventHandler ["ButtonClick",{
params ["_saveAsButton_ctrl"];

private _paramsMenuDisplay = localNamespace getVariable [PARAMS_MENU_DISPLAY_VAR_STR,displayNull];
private _profileName = ctrlText (_paramsMenuDisplay displayCtrl PARAMS_MENU_SAVEAS_EDIT_BOX_IDC);
private _paramsMenuDisplay = GET_PARAMS_MENU_DISPLAY;
private _saveAsEditBox_ctrl = _paramsMenuDisplay displayCtrl PARAMS_MENU_SAVEAS_EDIT_BOX_IDC;
private _profileName = ctrlText _saveAsEditBox_ctrl;

if (_profileName isNotEqualTo "") then {
private _savedProfilesHash = GET_PARAMS_SAVED_PROFILES_HASHMAP;
Expand All @@ -68,12 +70,22 @@ _saveAsButton_ctrl ctrlAddEventHandler ["ButtonClick",{
profilenamespace setVariable [GET_PARAMS_PROFILE_VAR_STR,_savedProfilesHash];
saveProfileNamespace;

[_paramsMenuDisplay displayCtrl PARAMS_MENU_LOAD_COMBO_IDC] spawn KISKA_fnc_paramsMenu_updateLoadCombo;
private _loadCombo_ctrl = _paramsMenuDisplay displayCtrl PARAMS_MENU_LOAD_COMBO_IDC;
private _profiles = (keys _savedProfilesHash);
_profiles sort true;
private _index = _profiles find _profileName;
[_paramsMenuDisplay displayCtrl PARAMS_MENU_LOAD_COMBO_IDC,_index] spawn KISKA_fnc_paramsMenu_updateLoadCombo;

["Saved profile: " + _profileName] call KISKA_fnc_paramsMenu_logMessage;

_saveAsEditBox_ctrl ctrlSetText "";

} else {
["You must enter a profile name"] call KISKA_fnc_paramsMenu_logMessage;

};


}];


Expand Down Expand Up @@ -139,9 +151,11 @@ _deleteButton_ctrl ctrlAddEventHandler ["ButtonClick",{
saveProfileNamespace;

[_loadCombo_ctrl] spawn KISKA_fnc_paramsMenu_updateLoadCombo;
["Saved profile: " + _profileName] call KISKA_fnc_paramsMenu_logMessage;
["Deleted profile: " + _profileName] call KISKA_fnc_paramsMenu_logMessage;

} else {
["No valid profile selected for deletetion..."] call KISKA_fnc_paramsMenu_logMessage;

};
}];

Expand Down