W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-05-15 07:03:21 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/vbawol/DayZ-Epoch

Browse Source
This commit is contained in:
[VB]AWOL
2014-02-06 12:38:00 -06:00
parent 59d5fcd87f ef0901a1f9
commit f03a46ea8b
5 changed files with 200 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGE LOG 1.0.4.1.txt
View File

@@ -1,6 +1,7 @@
[NEW] Base Building Godmode is now included. Use DZE_GodModeBase = true; to enable it. (Disabled by Default) @Skaronator [NEW] Base Building Godmode is now included. Use DZE_GodModeBase = true; to enable it. (Disabled by Default) @Skaronator
[NEW] Config based trader setup option that is more performant, however does not track inventory. DZE_ConfigTrader = true; and #include "\dayz_epoch_b\CfgServerTrader\cfgServerTrader.hpp" in description.ext @Fank @Skaronator @vbawol [NEW] Config based trader setup option that is more performant, however does not track inventory. DZE_ConfigTrader = true; and #include "\dayz_epoch_b\CfgServerTrader\cfgServerTrader.hpp" in description.ext @Fank @Skaronator @vbawol
[ADDED] Static build construction count will force the constructioncount to number set by DZE_StaticConstructionCount = # in init.sqf. @Fank
[ADDED] Stacking of 10oz silver bars into briefcases, also traders now give this as change if return is 2-9 10oz silver bars. @vbawol [ADDED] Stacking of 10oz silver bars into briefcases, also traders now give this as change if return is 2-9 10oz silver bars. @vbawol
[ADDED] Variable DZE_DamageBeforeMaint to control what damage level is needed for the maintain option to appear. @vbawol [ADDED] Variable DZE_DamageBeforeMaint to control what damage level is needed for the maintain option to appear. @vbawol
[ADDED] Keep safe/lockbox vars server side. This should help with performance. @maca134 @Skaronator [ADDED] Keep safe/lockbox vars server side. This should help with performance. @maca134 @Skaronator
@@ -27,6 +28,7 @@
[FIXED] DZE_MissionLootTable - Some things are missing. @vbawol @Skaronator [FIXED] DZE_MissionLootTable - Some things are missing. @vbawol @Skaronator
[FIXED] General cleanup and fixes. @Fank @Skaronator @icomrade @vbawol [FIXED] General cleanup and fixes. @Fank @Skaronator @icomrade @vbawol
[CHANGED] Selling vehicle will now remove the key if you have it on your toolbelt. @Fank
[CHANGED] R3F weight now in Kg for every language except english. @VeryBigBro [CHANGED] R3F weight now in Kg for every language except english. @VeryBigBro
[CHANGED] Increased trader prices for Armed vehicles and pipebombs. @vbawol [CHANGED] Increased trader prices for Armed vehicles and pipebombs. @vbawol
[CHANGED] Added BAF_Merlin_DZE and MH60S_DZE to traders. @vbawol [CHANGED] Added BAF_Merlin_DZE and MH60S_DZE to traders. @vbawol

9
SQF/dayz_code/actions/player_build.sqf
View File

@@ -390,8 +390,13 @@ if (_hasrequireditem) then {
_limit = 3; _limit = 3;
if(isNumber (configFile >> "CfgVehicles" >> _classname >> "constructioncount")) then { if (DZE_StaticConstructionCount > 0) then {
_limit = getNumber(configFile >> "CfgVehicles" >> _classname >> "constructioncount"); _limit = DZE_StaticConstructionCount;
}
else {
if (isNumber (configFile >> "CfgVehicles" >> _classname >> "constructioncount")) then {
_limit = getNumber(configFile >> "CfgVehicles" >> _classname >> "constructioncount");
};
}; };
_isOk = true; _isOk = true;

9
SQF/dayz_code/actions/remove.sqf
View File

@@ -36,8 +36,13 @@ _isMine = _objType in ["Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gol
_isModular = _obj isKindOf "ModularItems"; _isModular = _obj isKindOf "ModularItems";
_limit = 3; _limit = 3;
if(isNumber (configFile >> "CfgVehicles" >> _objType >> "constructioncount")) then { if (DZE_StaticConstructionCount > 0) then {
_limit = getNumber(configFile >> "CfgVehicles" >> _objType >> "constructioncount"); _limit = DZE_StaticConstructionCount;
}
else {
if (isNumber (configFile >> "CfgVehicles" >> _objType >> "constructioncount")) then {
_limit = getNumber(configFile >> "_objType" >> _classname >> "constructioncount");
};
}; };
_findNearestPoles = nearestObjects[player, ["Plastic_Pole_EP1_DZ"], 30]; _findNearestPoles = nearestObjects[player, ["Plastic_Pole_EP1_DZ"], 30];

20
SQF/dayz_code/actions/trade_any_vehicle.sqf
View File

@@ -1,4 +1,4 @@
private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_temp_keys","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true; DZE_ActionInProgress = true;
@@ -214,8 +214,9 @@ if (_finished) then {
}; };
}; };
_objectID = _obj getVariable ["ObjectID","0"]; _objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"]; _objectUID = _obj getVariable ["ObjectUID","0"];
_objectCharacterId = _obj getVariable ["CharacterID","0"];
_notSetup = (_objectID == "0" && _objectUID == "0"); _notSetup = (_objectID == "0" && _objectUID == "0");
@@ -223,8 +224,6 @@ if (_finished) then {
if(_okToSell) then { if(_okToSell) then {
//if(_objectID != "0" && _objectUID != "0") then { //if(_objectID != "0" && _objectUID != "0") then {
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer]; PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
@@ -232,6 +231,17 @@ if (_finished) then {
deleteVehicle _obj; deleteVehicle _obj;
// remove Key
_temp_keys = [];
_keyColor = ["ItemKeyYellow","ItemKeyBlue","ItemKeyRed","ItemKeyGreen","ItemKeyBlack"];
{
if (configName(inheritsFrom(configFile >> "CfgWeapons" >> _x)) in _key_colors) then {
if (getNumber(configFile >> "CfgWeapons" >> _x >> "keyid") == _objectCharacterId) then {
[_activatingPlayer,_x] call BIS_fnc_invRemove;
};
};
} forEach (items _activatingPlayer);
// payout // payout
_canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange; _canAfford = [[[_part_out,_qty_out]],1] call epoch_returnChange;

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

@@ -18,26 +18,26 @@ AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","Survivor
//Cooking //Cooking
meatraw = [ meatraw = [
"FoodSteakRaw", "FoodSteakRaw",
"FoodmeatRaw", "FoodmeatRaw",
"FoodbeefRaw", "FoodbeefRaw",
"FoodmuttonRaw", "FoodmuttonRaw",
"FoodchickenRaw", "FoodchickenRaw",
"FoodrabbitRaw", "FoodrabbitRaw",
"FoodbaconRaw", "FoodbaconRaw",
"ItemTrout", "ItemTrout",
"ItemSeaBass", "ItemSeaBass",
"ItemTuna" "ItemTuna"
]; ];
exceptionsraw = ["ItemTuna"]; exceptionsraw = ["ItemTuna"];
meatcooked = [ meatcooked = [
"FoodSteakCooked", "FoodSteakCooked",
"FoodmeatCooked", "FoodmeatCooked",
"FoodbeefCooked", "FoodbeefCooked",
"FoodmuttonCooked", "FoodmuttonCooked",
"FoodchickenCooked", "FoodchickenCooked",
"FoodrabbitCooked", "FoodrabbitCooked",
"FoodbaconCooked", "FoodbaconCooked",
"ItemTroutCooked", "ItemTroutCooked",
"ItemSeaBassCooked", "ItemSeaBassCooked",
"ItemTunaCooked" "ItemTunaCooked"
@@ -49,10 +49,10 @@ no_output_food = ["FoodMRE", "FoodPistachio", "FoodNutmix","FoodBioMeat"]+meatco
badfood = ["FoodBioMeat","FoodCanUnlabeled"]; badfood = ["FoodBioMeat","FoodCanUnlabeled"];
food_with_output=[ food_with_output=[
"FoodCanBakedBeans", "FoodCanBakedBeans",
"FoodCanSardines", "FoodCanSardines",
"FoodCanFrankBeans", "FoodCanFrankBeans",
"FoodCanPasta", "FoodCanPasta",
"FoodCanGriff", "FoodCanGriff",
"FoodCanBadguy", "FoodCanBadguy",
"FoodCanBoneboy", "FoodCanBoneboy",
@@ -68,10 +68,10 @@ food_with_output=[
]; ];
food_output = [ food_output = [
"TrashTinCan", "TrashTinCan",
"TrashTinCan", "TrashTinCan",
"TrashTinCan", "TrashTinCan",
"TrashTinCan", "TrashTinCan",
"FoodCanGriffEmpty", "FoodCanGriffEmpty",
"FoodCanBadguyEmpty", "FoodCanBadguyEmpty",
"FoodCanBoneboyEmpty", "FoodCanBoneboyEmpty",
@@ -88,41 +88,41 @@ food_output = [
//Drinking //Drinking
no_output_drink = ["ItemWaterbottle", "ItemWaterbottleBoiled"]; no_output_drink = ["ItemWaterbottle", "ItemWaterbottleBoiled"];
drink_with_output = [ drink_with_output = [
"ItemSoda", //just to define item for ItemSodaEmpty "ItemSoda", //just to define item for ItemSodaEmpty
"ItemSodaRbull", "ItemSodaRbull",
"ItemSodaOrangeSherbet", "ItemSodaOrangeSherbet",
"ItemSodaCoke", "ItemSodaCoke",
"ItemSodaPepsi", "ItemSodaPepsi",
"ItemSodaMdew", "ItemSodaMdew",
"ItemSodaMtngreen", "ItemSodaMtngreen",
"ItemSodaR4z0r", "ItemSodaR4z0r",
"ItemSodaClays", "ItemSodaClays",
"ItemSodaSmasht", "ItemSodaSmasht",
"ItemSodaDrwaste", "ItemSodaDrwaste",
"ItemSodaLemonade", "ItemSodaLemonade",
"ItemSodaLvg", "ItemSodaLvg",
"ItemSodaMzly", "ItemSodaMzly",
"ItemSodaRabbit" "ItemSodaRabbit"
]; ];
drink_output = [ drink_output = [
"ItemSodaEmpty",
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaCokeEmpty", "ItemSodaEmpty",
"ItemSodaPepsiEmpty", "ItemSodaCokeEmpty",
"ItemSodaMdewEmpty", "ItemSodaPepsiEmpty",
"ItemSodaMtngreenEmpty", "ItemSodaMdewEmpty",
"ItemSodaR4z0rEmpty", "ItemSodaMtngreenEmpty",
"ItemSodaClaysEmpty", "ItemSodaR4z0rEmpty",
"ItemSodaSmashtEmpty", "ItemSodaClaysEmpty",
"ItemSodaDrwasteEmpty", "ItemSodaSmashtEmpty",
"ItemSodaLemonadeEmpty", "ItemSodaDrwasteEmpty",
"ItemSodaLvgEmpty", "ItemSodaLemonadeEmpty",
"ItemSodaMzlyEmpty", "ItemSodaLvgEmpty",
"ItemSodaRabbitEmpty" "ItemSodaMzlyEmpty",
"ItemSodaRabbitEmpty"
]; ];
boil_tin_cans = [ boil_tin_cans = [
"TrashTinCan", "TrashTinCan",
"FoodCanGriffEmpty", "FoodCanGriffEmpty",
"FoodCanBadguyEmpty", "FoodCanBadguyEmpty",
"FoodCanBoneboyEmpty", "FoodCanBoneboyEmpty",
@@ -135,19 +135,19 @@ boil_tin_cans = [
"FoodCanPowellEmpty", "FoodCanPowellEmpty",
"FoodCanTylersEmpty", "FoodCanTylersEmpty",
"FoodCanUnlabeledEmpty", "FoodCanUnlabeledEmpty",
"ItemSodaEmpty", "ItemSodaEmpty",
"ItemSodaCokeEmpty", "ItemSodaCokeEmpty",
"ItemSodaPepsiEmpty", "ItemSodaPepsiEmpty",
"ItemSodaMdewEmpty", "ItemSodaMdewEmpty",
"ItemSodaMtngreenEmpty", "ItemSodaMtngreenEmpty",
"ItemSodaR4z0rEmpty", "ItemSodaR4z0rEmpty",
"ItemSodaClaysEmpty", "ItemSodaClaysEmpty",
"ItemSodaSmashtEmpty", "ItemSodaSmashtEmpty",
"ItemSodaDrwasteEmpty", "ItemSodaDrwasteEmpty",
"ItemSodaLemonadeEmpty", "ItemSodaLemonadeEmpty",
"ItemSodaLvgEmpty", "ItemSodaLvgEmpty",
"ItemSodaMzlyEmpty", "ItemSodaMzlyEmpty",
"ItemSodaRabbitEmpty" "ItemSodaRabbitEmpty"
]; ];
dayz_combination = ""; dayz_combination = "";
@@ -245,7 +245,7 @@ dayz_resetSelfActions = {
s_halo_action = -1; s_halo_action = -1;
s_player_SurrenderedGear = -1; s_player_SurrenderedGear = -1;
s_player_maintain_area = -1; s_player_maintain_area = -1;
s_player_maintain_area_preview = -1; s_player_maintain_area_preview = -1;
s_player_heli_lift = -1; s_player_heli_lift = -1;
s_player_heli_detach = -1; s_player_heli_detach = -1;
}; };
@@ -505,6 +505,9 @@ if(isNil "DZE_HeliLift") then {
if(isNil "DZE_DamageBeforeMaint") then { if(isNil "DZE_DamageBeforeMaint") then {
DZE_DamageBeforeMaint = 0.09; DZE_DamageBeforeMaint = 0.09;
}; };
if(isNil "DZE_StaticConstructionCount") then {
DZE_StaticConstructionCount = 0;
};
// needed on server // needed on server