W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #866 from dayz10k/master

Browse Source 
melee mags for skinchanges, actions after skinchanges
This commit is contained in:
HARLAN
2013-12-06 08:40:28 -08:00
parent 1255989f4e 688422a22e
commit c79af3a8da
5 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SQF/dayz_code/Configs/CfgWeapons.hpp
View File

@@ -83,6 +83,7 @@ class CfgWeapons {
class ChainSaw: Rifle class ChainSaw: Rifle
{ {
scope = 2; scope = 2;
melee= "true";
/* /*
bullet1[] = {"ca\sounds\weapons\shells\big_shell_wood_01",0.0707946,1,15}; bullet1[] = {"ca\sounds\weapons\shells\big_shell_wood_01",0.0707946,1,15};

7
SQF/dayz_code/compile/player_humanityMorph.sqf
View File

@@ -90,6 +90,13 @@ player allowDamage true;
player addWeapon "Loot"; player addWeapon "Loot";
player addWeapon "Flare"; player addWeapon "Flare";
//melee check
_wpnType = primaryWeapon player;
_ismelee = (gettext (configFile >> "CfgWeapons" >> _wpnType >> "melee"));
if (_ismelee == "true") then {
call dayz_meleeMagazineCheck;
};
sleep 0.1; sleep 0.1;
if (!isNull _old) then { if (!isNull _old) then {

13
SQF/dayz_code/compile/player_switchModel.sqf
View File

@@ -208,4 +208,15 @@ diag_log str(getMagazineCargo unitBackpack _newUnit);
_playerUID=getPlayerUID player; _playerUID=getPlayerUID player;
_playerObjName = format["player%1",_playerUID]; _playerObjName = format["player%1",_playerUID];
call compile format["%1 = player;",_playerObjName]; call compile format["%1 = player;",_playerObjName];
publicVariable _playerObjName; publicVariable _playerObjName;
//melee check
_wpnType = primaryWeapon player;
_ismelee = (gettext (configFile >> "CfgWeapons" >> _wpnType >> "melee"));
if (_ismelee == "true") then {
call dayz_meleeMagazineCheck;
};
//reveal all near objects.
{player reveal _x} forEach (nearestObjects [getPosATL player, ["All"], 75]);
//All is arbitrary and will need to be changed to ["AllVehicles","WeaponHolder","tentStorage"] ++ others (stashes etc.)

11
SQF/dayz_code/init/compiles.sqf
View File

@@ -432,6 +432,15 @@ if (!isDedicated) then {
endLoadingScreen; endLoadingScreen;
}; };
dayz_meleeMagazineCheck = {
private["_meleeNum","_magType"];
_magType = ([] + getArray (configFile >> "CfgWeapons" >> _wpnType >> "magazines")) select 0;
_meleeNum = ({_x == _magType} count magazines player);
if (_meleeNum < 1) then {
player addMagazine _magType;
};
};
dayz_originalPlayer = player; dayz_originalPlayer = player;
progressLoadingScreen 0.8; progressLoadingScreen 0.8;
@@ -543,4 +552,4 @@ if (!isDedicated) then {
eh_localCleanup = {}; eh_localCleanup = {};
}; };
initialized = true; initialized = true;

14
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -1,4 +1,4 @@
private ["_refObj","_size","_vel","_speed","_hunger","_thirst","_result","_factor","_mylastPos","_distance","_lastTemp","_rnd","_listTalk","_id","_messTimer","_combatdisplay","_combatcontrol","_timeleft","_inVehicle","_lastUpdate","_foodVal","_thirstVal","_lowBlood","_startcombattimer","_combattimeout","_isPZombie","_outsideMap","_radsound","_bloodloss","_radTimer","_currentBlood"]; private ["_refObj","_size","_vel","_speed","_hunger","_thirst","_result","_factor","_mylastPos","_distance","_lastTemp","_rnd","_listTalk","_id","_messTimer","_combatdisplay","_combatcontrol","_timeleft","_inVehicle","_lastUpdate","_foodVal","_thirstVal","_lowBlood","_startcombattimer","_combattimeout","_isPZombie","_outsideMap","_radsound","_bloodloss","_radTimer","_currentBlood","_wpnType"];
disableSerialization; disableSerialization;
_messTimer = 0; _messTimer = 0;
@@ -246,9 +246,19 @@ while {true} do {
_combatcontrol ctrlShow true; _combatcontrol ctrlShow true;
}; };
//Melee Weapons ammo fix
if(isNil {login_ammochecked}) then {
login_ammochecked = true;
_wpnType = primaryWeapon player;
_ismelee = (gettext (configFile >> "CfgWeapons" >> _wpnType >> "melee"));
if (_ismelee == "true") then {
call dayz_meleeMagazineCheck;
};
};
// Blood Effects // Blood Effects
"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, (r_player_blood/r_player_bloodTotal)], [1, 1, 1, 0.0]]; "colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, (r_player_blood/r_player_bloodTotal)], [1, 1, 1, 0.0]];
"colorCorrections" ppEffectCommit 0; "colorCorrections" ppEffectCommit 0;
sleep 2; sleep 2;
}; };