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

Comment some unused achievement code

Browse Source 
Vanilla commits:

3ec1cc3c5d

3171f68bee
This commit is contained in:
ebaydayz
2016-11-18 13:22:36 -05:00
parent ad9a287d00
commit b01a4165a8
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/actions/gather_meat.sqf
View File

@@ -55,10 +55,7 @@ if ((count _knifeArray > 0) and !_hasHarvested) then {
PVCDZ_obj_GutBody =[_item,_qty]; PVCDZ_obj_GutBody =[_item,_qty];
publicVariable "PVCDZ_obj_GutBody"; publicVariable "PVCDZ_obj_GutBody";
//achievement system //if (!achievement_Gut) then {achievement_Gut = true;};
if (!achievement_Gut) then {
achievement_Gut = true;
};
}; };
if (dayz_knifeDulling) then { if (dayz_knifeDulling) then {

4
SQF/dayz_code/actions/player_makefire.sqf
View File

@@ -68,12 +68,12 @@ if ((count _worldspace) == 2) then {
[_fire,true] call dayz_inflame; [_fire,true] call dayz_inflame;
_fire spawn player_fireMonitor; _fire spawn player_fireMonitor;
if (dayz_playerAchievements select 14 < 1) then { /*if (dayz_playerAchievements select 14 < 1) then {
// Firestarter // Firestarter
dayz_playerAchievements set [14,1]; dayz_playerAchievements set [14,1];
achievement = [14, player, dayz_characterID]; achievement = [14, player, dayz_characterID];
publicVariableServer "achievement"; publicVariableServer "achievement";
}; };*/
//localize "str_fireplace_01" call dayz_rollingMessages; //localize "str_fireplace_01" call dayz_rollingMessages;
(localize "str_fireplace_01") call dayz_rollingMessages; (localize "str_fireplace_01") call dayz_rollingMessages;
} else { } else {

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

@@ -22,7 +22,7 @@ _zombieKills = player getVariable ["zombieKills",0];
_headShots = player getVariable ["headShots",0]; _headShots = player getVariable ["headShots",0];
_humanKills = player getVariable ["humanKills",0]; _humanKills = player getVariable ["humanKills",0];
_banditKills = player getVariable ["banditKills",0]; _banditKills = player getVariable ["banditKills",0];
_achievements = player getVariable ["Achievements",[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]; //_achievements = player getVariable ["Achievements",[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]];
_combattimeout = player getVariable["combattimeout",0]; _combattimeout = player getVariable["combattimeout",0];
_inCombat = player getVariable ["inCombat",false]; _inCombat = player getVariable ["inCombat",false];
_ConfirmedHumanKills = player getVariable ["ConfirmedHumanKills",0]; _ConfirmedHumanKills = player getVariable ["ConfirmedHumanKills",0];
@@ -81,7 +81,7 @@ player setVariable ["humanKills",_humanKills,true];
player setVariable ["banditKills",_banditKills,true]; player setVariable ["banditKills",_banditKills,true];
player setVariable ["characterID",_charID,true]; player setVariable ["characterID",_charID,true];
player setVariable ["worldspace",_worldspace]; player setVariable ["worldspace",_worldspace];
player setVariable ["Achievements",_achievements]; //player setVariable ["Achievements",_achievements];
player setVariable ["combattimeout",_combattimeout,false]; player setVariable ["combattimeout",_combattimeout,false];
player setVariable ["inCombat",_inCombat,true]; player setVariable ["inCombat",_inCombat,true];
@@ -90,8 +90,8 @@ player setVariable ["ConfirmedBanditKills",_ConfirmedBanditKills,true];
player setVariable ["friendlies",_friendlies,true]; player setVariable ["friendlies",_friendlies,true];
player setVariable ["DZE_display_name",_tagSetting,true]; player setVariable ["DZE_display_name",_tagSetting,true];
PVDZ_serverStoreVar = [player,"Achievements",_achievements]; //PVDZ_serverStoreVar = [player,"Achievements",_achievements];
publicVariableServer "PVDZ_serverStoreVar"; //publicVariableServer "PVDZ_serverStoreVar";
call dayz_resetSelfActions; call dayz_resetSelfActions;
eh_player_killed = player addeventhandler ["FiredNear",{_this call player_weaponFiredNear;}]; eh_player_killed = player addeventhandler ["FiredNear",{_this call player_weaponFiredNear;}];

2
SQF/dayz_code/init/variables.sqf
View File

@@ -62,7 +62,7 @@ DayZ_DropDrageeObjects = ["WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGa
DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","LockboxStorage","TentStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ","Scaffolding_DZ"]; DayZ_GearedObjects = ["Car","Helicopter","Motorcycle","Ship","TentStorage_base","StashSmall_base","StashMedium_base","Plane","Tank","VaultStorage","LockboxStorage","TentStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ","Scaffolding_DZ"];
DayZ_RestingAnims = ["amovpsitmstpsnonwpstdnon_ground","amovpsitmstpsnonwpstdnon_smoking","amovpsitmstpsraswrfldnon_weaponcheck1","amovpsitmstpsraswrfldnon"]; DayZ_RestingAnims = ["amovpsitmstpsnonwpstdnon_ground","amovpsitmstpsnonwpstdnon_smoking","amovpsitmstpsraswrfldnon_weaponcheck1","amovpsitmstpsraswrfldnon"];
dayz_typedBags = ["bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; dayz_typedBags = ["bloodTester","bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"];
dayz_playerAchievements = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]; dayz_playerAchievements = []; //[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","b_corylus.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"]; dayz_trees = ["ind_timbers.p3d","t_picea2s_snow.p3d","b_corylus.p3d","t_quercus3s.p3d","t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d","str habr.p3d","brg_bird_1.p3d","brg_bird_2.p3d","brg_bird_3.p3d","brg_umbrella_acacia02b.p3d","brg_africandoumpalm_1.p3d","brg_umbrella_acacia04b.p3d","brg_datepalm_4.p3d","brg_datepalm_1.p3d","brg_umbrella_acacia03b.p3d","brg_bottle_4.p3d","brg_aloe1.p3d","brg_umbrella_acacia03.p3d","brg_umbrella_acacia01.p3d","brg_umbrella_acacia04.p3d","brg_aloe2.p3d","brg_umbrella_acacia02.p3d","brg_aloe3.p3d","brg_bottle_1.p3d","brg_datepalm_3.p3d","brg_datepalm_2.p3d","brg_baobab_1.p3d","brg_bottle_2.p3d","brg_bottle_3.p3d","t_fraxinus2s.p3d","t_carpinus2s.p3d"];
Dayz_meatraw = Dayz_meatraw =

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

@@ -297,9 +297,9 @@ while {1 == 1} do {
PVDZ_plr_Save = [player,nil,false,dayz_playerAchievements]; PVDZ_plr_Save = [player,nil,false,dayz_playerAchievements];
publicVariableServer "PVDZ_plr_Save"; publicVariableServer "PVDZ_plr_Save";
PVDZ_serverStoreVar = [player,"Achievements",dayz_playerAchievements]; //PVDZ_serverStoreVar = [player,"Achievements",dayz_playerAchievements];
publicVariableServer "PVDZ_serverStoreVar"; //publicVariableServer "PVDZ_serverStoreVar";
player setVariable ["Achievements",dayz_playerAchievements,false]; //player setVariable ["Achievements",dayz_playerAchievements,false];
if (isServer) then { if (isServer) then {
PVDZ_plr_Save call server_playerSync; PVDZ_plr_Save call server_playerSync;

4
SQF/dayz_code/system/scheduler/sched_init.sqf
View File

@@ -15,7 +15,7 @@ call compile preprocessFileLineNumbers (_base+"sched_newDay.sqf");
call compile preprocessFileLineNumbers (_base+"sched_spawnCheck.sqf"); call compile preprocessFileLineNumbers (_base+"sched_spawnCheck.sqf");
call compile preprocessFileLineNumbers (_base+"sched_playerActions.sqf"); call compile preprocessFileLineNumbers (_base+"sched_playerActions.sqf");
call compile preprocessFileLineNumbers (_base+"sched_medical.sqf"); call compile preprocessFileLineNumbers (_base+"sched_medical.sqf");
call compile preprocessFileLineNumbers (_base+"sched_achievement.sqf"); //call compile preprocessFileLineNumbers (_base+"sched_achievement.sqf");
call compile preprocessFileLineNumbers (_base+"sched_gui.sqf"); call compile preprocessFileLineNumbers (_base+"sched_gui.sqf");
call compile preprocessFileLineNumbers (_base+"sched_buildingBubble.sqf"); call compile preprocessFileLineNumbers (_base+"sched_buildingBubble.sqf");
@@ -37,7 +37,7 @@ if (count _list == 0) then {
[ 1, 0.63, sched_throwable, sched_throwable_init ], [ 1, 0.63, sched_throwable, sched_throwable_init ],
[ 1, 0.33, sched_medical, sched_medical_init ], [ 1, 0.33, sched_medical, sched_medical_init ],
[ 10, 0.26, sched_plantHint ], [ 10, 0.26, sched_plantHint ],
[ 3, 2.70, sched_achievement, sched_achievement_init ], //[ 3, 2.70, sched_achievement, sched_achievement_init ],
[ 4, 2.38, sched_bloodStains, sched_bloodStains_init ], [ 4, 2.38, sched_bloodStains, sched_bloodStains_init ],
[ 60, 10.44, sched_animals ], [ 60, 10.44, sched_animals ],
[ 10, 5.44, sched_medical_slow ], [ 10, 5.44, sched_medical_slow ],

4
SQF/dayz_server/init/server_functions.sqf
View File

@@ -68,7 +68,7 @@ server_medicalSync = {
_player setVariable ["messing",(_array select 13)]; //13 _player setVariable ["messing",(_array select 13)]; //13
_player setVariable ["blood_testdone",(_array select 14)]; //14 _player setVariable ["blood_testdone",(_array select 14)]; //14
}; };
/*
dayz_Achievements = { dayz_Achievements = {
_achievementID = (_this select 0) select 0; _achievementID = (_this select 0) select 0;
_player = (_this select 0) select 1; _player = (_this select 0) select 1;
@@ -78,7 +78,7 @@ dayz_Achievements = {
_achievements set [_achievementID,1]; _achievements set [_achievementID,1];
_player setVariable ["Achievements",_achievements]; _player setVariable ["Achievements",_achievements];
}; };
*/
vehicle_handleServerKilled = { vehicle_handleServerKilled = {
private ["_unit","_killer"]; private ["_unit","_killer"];
_unit = _this select 0; _unit = _this select 0;