Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
636f600
Added EventHandler for negative playerRating
ultranoobian Jul 6, 2017
bf61030
Added safe spawner location to vehicle and squad spawning
Aug 14, 2017
4b2af98
Added and tested group leader reset
ultranoobian Aug 29, 2017
5fdddef
Merge branch 'development-feature-groupReset' into development
ultranoobian Aug 29, 2017
35ac94b
Merge remote-tracking branch 'origin/development-feature-BetrayerHand…
ultranoobian Aug 29, 2017
5e7c558
Replaced bis_fnc_findSafePos with findEmptyPosition
ultranoobian Aug 29, 2017
d73de01
Lowering spawn range
ultranoobian Aug 31, 2017
027e8b4
Merge branch 'development-feature-unitspawner' into development
ultranoobian Sep 1, 2017
79305c7
Fixed betrayerHandler stopping INIT.sqf from finishing
ultranoobian Sep 2, 2017
3312859
Merge branch 'development-feature-BetrayerHandler' into development
ultranoobian Sep 2, 2017
5749b3d
Added missing brackets to rating expression
ultranoobian Oct 12, 2017
354ad3b
Refactored vehicle spawning code into seperate file
ultranoobian Oct 12, 2017
5c11715
Replaced case 0 for testing with new seperated spawning code
ultranoobian Oct 12, 2017
0b18de4
Added log message and missing semicolons
ultranoobian Oct 12, 2017
4af62b6
Replaced all instances in request_vehicle.sqf with refactored version
ultranoobian Oct 12, 2017
da73215
Added placeholders for EWS eventhandler and UAV crew creation.
ultranoobian Oct 12, 2017
f3f0b1a
Moved EWS EH into new spawner
ultranoobian Oct 13, 2017
1229492
Fixed incorrect URI for sound file
ultranoobian Oct 13, 2017
db62868
Merge branch 'development-feature-unitspawner' into development
ultranoobian Oct 13, 2017
c25848a
Added Black Wasp II and Stealth version
ultranoobian Oct 12, 2017
8b20baa
Updated Jet-DLC jets to new vehicle spawning code
ultranoobian Oct 13, 2017
fa28e8f
Fixed vehicle spawning function not reducing CP according to cost
ultranoobian Oct 14, 2017
eb75d44
Reduced minimum spawning range for vehicles and added safe spawn check
ultranoobian Oct 14, 2017
c9a5149
Moved mission parameter check for Stamina System outside MP code block
ultranoobian Oct 14, 2017
14fbd4b
Fixed enumeration issue with blank string
ultranoobian Dec 6, 2017
31b9455
Merge branch 'development'
ultranoobian Dec 9, 2017
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
28 changes: 23 additions & 5 deletions source/INIT.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,26 @@ execvm "dynamic_music\dyn_music_init.sqf";
if (hasInterface) then { execVM "misc\gps_marker.sqf";};
if (!isMultiplayer) then {
getsize_script = [player] execVM "mapsize.sqf";
};

};
staminaEnabled = ["Stamina", false] call BIS_fnc_getParamValue;
if(staminaEnabled == 0) then {
staminaEnabled = false;
} else {
staminaEnabled = true;
};
// IF MP
if (isMultiplayer) then {

// Get the variables from the parameters lobby
_revive_activated = ["Revive", 1] call BIS_fnc_getParamValue;
DUWSMP_CP_death_cost = ["DeathPenalty", 1] call BIS_fnc_getParamValue;
staminaEnabled = ["Stamina", 0] call BIS_fnc_getParamValue;
//staminaEnabled = ["Stamina", 0] call BIS_fnc_getParamValue;

if(staminaEnabled == 0) then {
/*if(staminaEnabled == 0) then {
staminaEnabled = false;
} else {
staminaEnabled = true;
};
};*/

if (support_armory_available) then {
hq_blu1 addaction ["<t color='#ff0066'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
Expand All @@ -42,10 +47,23 @@ if (isMultiplayer) then {
};

if (_revive_activated == 1) then {execVM "duws_revive\reviveInit.sqf"};

PlayerKilledEH = player addEventHandler ["killed", {
commandpointsblu1 = commandpointsblu1 - DUWSMP_CP_death_cost;
publicVariable "commandpointsblu1";
}];

PlayerBetrayerEH = player addEventHandler ["HandleRating", {
// If playerRating is negative (traitor) then reset to zero
_playerRating = rating (_this select 0);
if (_playerRating < 0) then {
player addRating (0 - _playerRating);
};
// If final rating is positive, do not modify, else zero.
_rating = _this select 1;
[0,_rating] select ((_playerRating - _rating) > 0);
}];

"support_specialized_training_available" addPublicVariableEventHandler {lbSetColor [2103, 11, [0, 1, 0, 1]];};
"support_armory_available" addPublicVariableEventHandler {
hq_blu1 addaction ["<t color='#ff0066'>Armory (VA)</t>","bisArsenal.sqf", "", 0, true, true, "", "_this == player"];
Expand Down
6 changes: 3 additions & 3 deletions source/dialog/hc_init.sqf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// _center = createCenter sideLogic; un center existe d�j�
// _center = createCenter sideLogic; un center existe d�j�

// create && synchronize HC
_grplogic = createGroup sideLogic;
_hc_module = _grplogic createUnit ["HighCommand",[0,0,0] , [], 0, ""];
_hc_module = _grplogic createUnit ["HighCommand",[0,0,0] , [], 0, "NONE"];
_hc_module synchronizeObjectsAdd [player];
// done,

// make 1 HC subordinate so that the player will not control all blufor forces
_grplogic = createGroup sideLogic;
_sub_module = _grplogic createUnit ["HighCommandsubordinate",[0,0,0] , [], 0, ""];
_sub_module = _grplogic createUnit ["HighCommandsubordinate",[0,0,0] , [], 0, "NONE"];
_sub_module synchronizeObjectsAdd [_hc_module];
2 changes: 2 additions & 0 deletions source/dialog/request.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ _index1 = lbAdd [2102, "UAV Darter(5CP)"]; // 32
_index1 = lbAdd [2102, "Blackfish Infantry (40CP)"]; // 33
_index1 = lbAdd [2102, "Blackfish Vehicle (45CP)"]; // 34
_index1 = lbAdd [2102, "Blackfish Armed (60CP)"]; // 35
_index1 = lbAdd [2102, "Black Wasp II (50CP)"]; // 36
_index1 = lbAdd [2102, "Black Wasp II (Stealth) (60CP)"]; // 37
lbSetCurSel [2102, 0];

// Supports !!! CHECK TO ADD AT INIT
Expand Down
7 changes: 5 additions & 2 deletions source/dialog/request_squad.sqf
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
_index = lbCurSel 2101;

_spawnPos = getpos hq_blu1;
//_spawnPos = getpos hq_blu1; blocked by Tuxu
//center, minDist, maxDist, objDist, waterMode, maxGrad, shoreMode, blacklistPos, defaultPos
//HQ, minDist=80,max =250, objdist = 20, landmode, maxgrad = 20, shoremode,
_spawnPos = [getpos hq_blu1, 80, 250, 20, 0, 20, 0] call BIS_fnc_findSafePos;
_spawnPos = [(_spawnPos select 0)+15, _spawnPos select 1];

switch (_index) do
Expand Down Expand Up @@ -186,4 +189,4 @@ switch (_index) do
};
};
};
publicVariable "commandpointsblu1";
publicVariable "commandpointsblu1";
Loading