Updated for Exile 0.9.6

Do not know if this works with Gr8 humanity yet
This commit is contained in:
happydayz 2016-03-08 00:16:24 +11:00
parent 6d4ed1c216
commit 6c55551d0e
6 changed files with 82 additions and 75 deletions

View File

@ -201,12 +201,14 @@ _bambiPlayer setVariable ["ExileDeaths", (_accountData select 3)];
_bambiPlayer setVariable ["ExileClanID", _clanID];
_bambiPlayer setVariable ["ExileClanName", _clanName];
_bambiPlayer setVariable ["ExileHunger", 50];//set to 50% as shouldnt be expect to be full fit and healthy after a defib!
_bambiPlayer setVariable ["ExileThirst", 50];//set to 50% as shouldnt be expect to be full fit and healthy after a defib!
_bambiPlayer setVariable ["ExileAlcohol", 0.1]; //testing making player a little "drunk" after the defib ;)
_bambiPlayer setVariable ["ExileName", _name];
_bambiPlayer setVariable ["ExileOwnerUID", getPlayerUID _requestingPlayer];
_bambiPlayer setVariable ["ExileIsBambi", false];
_bambiPlayer setVariable ["ExileHunger", 50]; //ur hungry
_bambiPlayer setVariable ["ExileThirst", 50]; //ur thirsty
_bambiPlayer setVariable ["ExileTemperature", 36]; //ur cold and clammy from death!
_bambiPlayer setVariable ["ExileWetness", 0];
_bambiPlayer setVariable ["ExileAlcohol", 0.1]; //ur a little woozy
_bambiPlayer setVariable ["ExileName", _name];
_bambiPlayer setVariable ["ExileOwnerUID", getPlayerUID _requestingPlayer];
_bambiPlayer setVariable ["ExileIsBambi", true];
_bambiPlayer setVariable ["ExileXM8IsOnline", false, true];
//diag_log format ["Bambiplayer = %1 --- _sessionID = %2",_bambiPlayer,_sessionID];
@ -257,6 +259,8 @@ _data =
(getItemCargo vestContainer _player) call ExileClient_util_cargo_getMap,
(vestContainer _player) call ExileClient_util_cargo_getMagazineMap,
(getWeaponCargo vestContainer _player) call ExileClient_util_cargo_getMap,
_player getVariable ["ExileTemperature", 0],
_player getVariable ["ExileWetness", 0],
_playerID
];
_extDB2Message = ["updatePlayer", _data] call ExileServer_util_extDB2_createMessage;
@ -304,13 +308,15 @@ format["setAccountHumanity:%1:%2", _newScore, getPlayerUID _requestingPlayer] ca
(netId _player),
str (_player getVariable ["ExileMoney", 0]),
str (_player getVariable ["ExileScore", 0]),
str (_player getVariable ["ExileHumanity", 0]),
str (_player getVariable ["ExileHumanity", 0]),
(_player getVariable ["ExileKills", 0]),
(_player getVariable ["ExileDeaths", 0]),
(_player getVariable ["ExileHunger", 100]),
(_player getVariable ["ExileThirst", 100]),
(_player getVariable ["ExileAlcohol", 0]),
(_player getVariable ["ExileClanName", ""])
(_player getVariable ["ExileClanName", ""]),
(_player getVariable ["ExileTemperature", 0]),
(_player getVariable ["ExileWetness", 0])
]
]
call ExileServer_system_network_send_to;
@ -337,7 +343,9 @@ format["setAccountScore:%1:%2", _newScore, getPlayerUID _requestingPlayer] call
(_player getVariable ["ExileHunger", 100]),
(_player getVariable ["ExileThirst", 100]),
(_player getVariable ["ExileAlcohol", 0]),
(_player getVariable ["ExileClanName", ""])
(_player getVariable ["ExileClanName", ""]),
(_player getVariable ["ExileTemperature", 0]),
(_player getVariable ["ExileWetness", 0])
]
]
call ExileServer_system_network_send_to;
@ -348,7 +356,7 @@ call ExileServer_system_network_send_to;
_player addMPEventHandler ["MPKilled", {_this call ExileServer_object_player_event_onMpKilled}];
_requestingPlayer setposatl [0,0,0];
_corpseGroup = createGroup independent; //test to prevent dead body still being in players group under certain circumstances

View File

@ -1,5 +1,8 @@
diag_log format['Enigma Exile Revive: Compiles Started - %1',time];
ENIGMA_server_publicEH =compileFinal preprocessFileLineNumbers "\enigma_exile_revive\init\server_publicEH.sqf";
ENIGMA_server_revivepublicEH =compileFinal preprocessFileLineNumbers "\enigma_exile_revive\init\server_publicEH.sqf";
ENIGMA_server_handle_UpdateStats =compileFinal preprocessFileLineNumbers "\enigma_exile_revive\compile\Enigma\Exile_UpdateStats.sqf";
ENIGMA_server_revivePlayer =compileFinal preprocessFileLineNumbers "\enigma_exile_revive\compile\Enigma\Exile_RevivePlayer.sqf";

View File

@ -1,4 +1,4 @@
diag_log format['Enigma Exile Revive: server_init %1',time];
call ENIGMA_server_publicEH;
call ENIGMA_server_revivepublicEH;
diag_log "ENIGMA: Init PublicEH";

View File

@ -3,17 +3,17 @@
*
* Exile Mod
* www.exilemod.com
* <EFBFBD> 2015 Exile Mod Team
* © 2015 Exile Mod Team
*
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International License.
* To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/4.0/.
*/
private["_respawnDelay","_layer","_descriptions"];
_respawnDelay = _this;
oldgroup = group player;
/////////////////////////////////added by happydayz/////////////////////////////////////
/////////////////////////////////added by happydayz/////////////////////////////////////
oldgroup = group player;
if (player getVariable["REVIVE", true]) then {
_descriptions =
@ -26,7 +26,36 @@ _descriptions =
player setVariable ['EnigmaRevivePermitted', true, true]; //adds action to be revived
[100] call BIS_fnc_bloodEffect;
ExileClientPostProcessingColorCorrections ppEffectAdjust [1, 1.1, -0.05, [0.4, 0.2, 0.3, -0.1], [0.79, 0.72, 0.62, 0], [0.5,0.5,0.5,0], [0,0,0,0,0,0,4]];
ExileClientPostProcessingColorCorrections ppEffectCommit 0;
ExileClientPostProcessingColorCorrections ppEffectAdjust [1, 1.1, -0.05, [0.4, 0.2, 0.3, -0.1], [0.3, 0.05, 0, 0], [0.5,0.5,0.5,0], [0,0,0,0,0,0,4]];
ExileClientPostProcessingColorCorrections ppEffectCommit _respawnDelay;
ExileClientPostProcessingBackgroundBlur ppEffectAdjust [0];
ExileClientPostProcessingBackgroundBlur ppEffectCommit 0;
ExileClientPostProcessingBackgroundBlur ppEffectEnable true;
ExileClientPostProcessingBackgroundBlur ppEffectAdjust [2];
ExileClientPostProcessingBackgroundBlur ppEffectCommit _respawnDelay;
ExileClientBleedOutHeartbeatPlaying = false;
ExileClientBleedOutCountDownDuration = _respawnDelay;
ExileClientBleedOutCountDownEnd = time + _respawnDelay;
player setVariable ["BleedoutCountDownEnd", ExileClientBleedOutCountDownEnd, true];
_layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
_layer cutText ["", "plain"];
missionnamespace setvariable ["RscRespawnCounter_description", format ["<t size='2' align='center'>%1</t>",selectRandom _descriptions]];
missionnamespace setvariable ["RscRespawnCounter_colorID", 0];
missionnamespace setvariable ["RscRespawnCounter_Custom", _respawnDelay];
_layer cutRsc ["RscRespawnCounter", "plain"];
showChat true;
"Start bleeding out..." call ExileClient_util_log;
if(ExileClientBleedOutThread isEqualTo -1)then
{
ExileClientBleedOutThread = [2, ExileClient_object_player_thread_bleedToDeath, [], true] call ExileClient_system_thread_addtask;
};
} else {
////////////////////////////////////////////////////////////////////////////////////////
@ -35,37 +64,18 @@ player setVariable ['EnigmaRevivePermitted', true, true]; //adds action to be re
ExileClientPostProcessingColorCorrections ppEffectAdjust [1, 1.1, -0.05, [0.4, 0.2, 0.3, -0.1], [0.79, 0.72, 0.62, 0], [0.5,0.5,0.5,0], [0,0,0,0,0,0,4]];
ExileClientPostProcessingColorCorrections ppEffectCommit 0;
ExileClientPostProcessingColorCorrections ppEffectAdjust [1, 1.1, -0.05, [0.4, 0.2, 0.3, -0.1], [0.3, 0.05, 0, 0], [0.5,0.5,0.5,0], [0,0,0,0,0,0,4]];
ExileClientPostProcessingColorCorrections ppEffectCommit _respawnDelay;
ExileClientPostProcessingColorCorrections ppEffectCommit _respawnDelay;
ExileClientPostProcessingBackgroundBlur ppEffectAdjust [0];
ExileClientPostProcessingBackgroundBlur ppEffectCommit 0;
ExileClientPostProcessingBackgroundBlur ppEffectEnable true;
ExileClientPostProcessingBackgroundBlur ppEffectAdjust [2];
ExileClientPostProcessingBackgroundBlur ppEffectCommit _respawnDelay;
ExileClientBleedOutHeartbeatPlaying = false;
ExileClientBleedOutHeartbeatPlaying = false;
ExileClientBleedOutCountDownDuration = _respawnDelay;
ExileClientBleedOutCountDownEnd = time + _respawnDelay;
player setVariable ["BleedoutCountDownEnd", ExileClientBleedOutCountDownEnd, true];
//added to prevent player bodies being revived after they have died! Frankenstein!!!!
_layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
_layer cutText ["", "plain"];
missionnamespace setvariable ["RscRespawnCounter_description", format ["<t size='2' align='center'>%1</t>", _descriptions call BIS_fnc_selectRandom]];
missionnamespace setvariable ["RscRespawnCounter_colorID", 0];
missionnamespace setvariable ["RscRespawnCounter_Custom", _respawnDelay];
_layer cutRsc ["RscRespawnCounter", "plain"];
showChat true;
"Start bleeding out..." call ExileClient_util_log;
if(ExileClientBleedOutThread isEqualTo -1)then
{
ExileClientBleedOutThread = [2, ExileClient_object_player_thread_bleedToDeath, [], true] call ExileClient_system_thread_addtask;
};
} else {
_descriptions =
_descriptions =
[
"WRECKED",
"REKT",
@ -73,7 +83,7 @@ _descriptions =
"WASTED",
"SCREWED",
"TOASTED",
"REST IN PIECES",
"REST IN PIECES",
"TERMINATED",
"KILLED",
"EXILED",
@ -92,34 +102,15 @@ _descriptions =
"SHREDDED",
"CRUSHED"
];
[100] call BIS_fnc_bloodEffect;
ExileClientPostProcessingColorCorrections ppEffectAdjust [1, 1.1, -0.05, [0.4, 0.2, 0.3, -0.1], [0.79, 0.72, 0.62, 0], [0.5,0.5,0.5,0], [0,0,0,0,0,0,4]];
ExileClientPostProcessingColorCorrections ppEffectCommit 0;
ExileClientPostProcessingColorCorrections ppEffectAdjust [1, 1.1, -0.05, [0.4, 0.2, 0.3, -0.1], [0.3, 0.05, 0, 0], [0.5,0.5,0.5,0], [0,0,0,0,0,0,4]];
ExileClientPostProcessingColorCorrections ppEffectCommit _respawnDelay;
ExileClientPostProcessingBackgroundBlur ppEffectAdjust [0];
ExileClientPostProcessingBackgroundBlur ppEffectCommit 0;
ExileClientPostProcessingBackgroundBlur ppEffectEnable true;
ExileClientPostProcessingBackgroundBlur ppEffectAdjust [2];
ExileClientPostProcessingBackgroundBlur ppEffectCommit _respawnDelay;
ExileClientBleedOutHeartbeatPlaying = false;
ExileClientBleedOutCountDownDuration = _respawnDelay;
ExileClientBleedOutCountDownEnd = time + _respawnDelay;
_layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
_layer cutText ["", "plain"];
missionnamespace setvariable ["RscRespawnCounter_description", format ["<t size='2' align='center'>%1</t>", _descriptions call BIS_fnc_selectRandom]];
missionnamespace setvariable ["RscRespawnCounter_description", format ["<t size='2' align='center'>%1</t>",selectRandom _descriptions]];
missionnamespace setvariable ["RscRespawnCounter_colorID", 0];
missionnamespace setvariable ["RscRespawnCounter_Custom", _respawnDelay];
_layer cutRsc ["RscRespawnCounter", "plain"];
showChat true;
"Start bleeding out..." call ExileClient_util_log;
if(ExileClientBleedOutThread isEqualTo -1)then
{
ExileClientBleedOutThread = [2, ExileClient_object_player_thread_bleedToDeath, [], true] call ExileClient_system_thread_addtask;
};
};
true
true

View File

@ -18,30 +18,35 @@ if (ExileClientIsHandcuffed) then
}
else
{
if (ExileClientIsInConstructionMode) then
if (ExileClientActionDelayShown) then
{
_cancelEvent = true;
_cancelEvent = true;
}
else
{
if ((locked _container) isEqualTo 2) then
{
if (ExileClientIsInConstructionMode) then
{
_cancelEvent = true;
_cancelEvent = true;
}
else
{
if ((_container getVariable ["ExileIsLocked", 1] isEqualTo -1) || (_container getVariable["antidupe", 1]) isEqualTo -1) then //added revive dupe test -- happdayz
else
{
if ((locked _container) isEqualTo 2) then
{
//hint "antidupe initiated";
_cancelEvent = true;
}
else
else
{
ExileClientInventoryOpened = true;
ExileClientCurrentInventoryContainer = _container;
if ((_container getVariable ["ExileIsLocked", 1] isEqualTo -1) || (_container getVariable["antidupe", 1]) isEqualTo -1) then //added revive dupe test -- happdayz
{
_cancelEvent = true;
}
else
{
ExileClientInventoryOpened = true;
ExileClientCurrentInventoryContainer = _container;
};
};
};
};
};
_cancelEvent // OKAY!
_cancelEvent // OKAY!