Merge branch 'master' into Version-6.59-Build-63

This commit is contained in:
Ghostrider-DbD- 2017-06-10 12:29:32 -04:00 committed by GitHub
commit 5faf1ae69d
5 changed files with 22 additions and 3 deletions

View File

@ -12,7 +12,7 @@
private["_missionType","_wasRunover","_launcher","_legal"];
params["_unit","_killer"];
//diag_log format["##-processIlleagalAIKills.sqf-## processing illeagal kills for unit %1",_unit];
diag_log format["##-processIlleagalAIKills.sqf-## processing illeagal kills for unit %1",_unit];
_launcher = _unit getVariable ["Launcher",""];
_legal = true;

View File

@ -1,6 +1,6 @@
/*
calculate a reward player for AI Kills in crypto.
calculate a reward player for AI Kills
Code fragment adapted from VEMF
call as [_unit,_killer] call blck_fnc_rewardKiller;
Last modified 6/3/17
@ -19,7 +19,11 @@ params["_unit","_killer"];
private["_modType","_reward","_maxReward","_dist","_killstreakReward","_distanceBonus","_newKillerScore","_newKillerFrags","_money"];
_modType = call blck_fnc_getModType;
//diag_log format["[blckeagles] rewardKiller:: - _modType = %1",_modType];
diag_log format["[blckeagles] rewardKiller:: - _modType = %1",_modType];
if (_modType isEqualTo "Epoch") exitWith {}; // Have players pull crypto from AI bodies now that this feature is available.
/*
if (_modType isEqualTo "Epoch") then
@ -83,9 +87,15 @@ if (_modType isEqualTo "Exile") then
_killstreakBonus = 3 * (_killer getVariable["blck_kills",0]);
_respectGained = 25 + _distanceBonus + _killstreakBonus;
_score = _killer getVariable ["ExileScore", 0];
//diag_log format["GMS_fnc_rewardKiller.sqf:: ExileScore = %1",_killer getVariable ["ExileScore", 0]];
_score = _score + (_respectGained);
//diag_log format["GMS_fnc_rewardKiller.sqf:: _new = %1",_score];
diag_log format["GMS_fnc_rewardKiller.sqf:: ExileScore = %1",_killer getVariable ["ExileScore", 0]];
_score = _score + (_respectGained);
diag_log format["GMS_fnc_rewardKiller.sqf:: _new = %1",_score];
_killer setVariable ["ExileScore", _score];
format["setAccountScore:%1:%2", _score,getPlayerUID _killer] call ExileServer_system_database_query_fireAndForget;
_newKillerFrags = _killer getVariable ["ExileKills", 0];

View File

@ -1,3 +1,8 @@
private ["_version","_versionDate"];
_blck_version = "6.59 Build 62";
_blck_versionDate = "6-7-17 9:00 PM";
_blck_version = "6.58 Build 60";
_blck_versionDate = "6-3-17 5:00 PM";

View File

@ -1,6 +1,6 @@
Blckegls mission system Ver 6.58
Build 59
Build 60
Included is an updated version of blckeagls mission system. This began as an effort to fix bugs in and upgrade version 2.0.2 as updated by Narines and has now evolved to a complete reworking of almost all code.

View File

@ -4,7 +4,11 @@ Loosely based on the AI mission system by blckeagls ver 2.0.2
Contributions by Narines: bug fixes, testing, infinite ammo fix.
Ideas or code from that by Vampire and KiloSwiss have been used for certain functions.
6/1/17 Version 6.59 Build 59
6/1/17 Version 6.59 Build 60
[changed] Players are no longer given crypto for each AI kill. Crypto added to AI Bodies was increased.
[fixed] error in GMS_fnc_setupWaypoints wherein _arc was not defined early enough in the script.
[fixed] Exile Respect Loss bug (temporary fix only).