W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +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:
Skaronator
2014-02-05 20:00:15 +01:00
parent 5deef8ba5c acdb7e7c6a
commit 9e3c82378f
37 changed files with 5467 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CHANGE LOG 1.0.4.1.txt
View File

@@ -1,14 +1,20 @@
[NEW] Config based trader setup option that is more performant, however does not track inventory. DZE_ConfigTrader = true; and #include "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] 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] Keep safe/lockbox vars server side. This should help with performance. @maca134 @Skaronator
[ADDED] Added SQL Function DeleteNonKeyVehicles run before server start and SQL event UnlockNonKeyVehicles run once a day. Use one or the other not both. @maca134 @Fank
[ADDED] Option to disable R3F weight system. DZE_R3F_WEIGHT = false in init.sqf to disable. @vbawol
[ADDED] Added to heli crash code, Blackhawk and Seahawk Wrecks by [GLT]Myke http://www.armaholic.com/page.php?id=10670
[ADDED] Added following Config Classes: M113_UN_EP1_DZ M113_UN_EP1_DZE M113_TK_EP1_DZ M113_TK_EP1_DZE BTR90_DZ BTR90_DZE BTR90_HQ_DZ BTR90_HQ_DZE LAV25_DZ LAV25_DZE LAV25_HQ_DZ LAV25_HQ_DZE @Fank
[FIXED] Add missing sensor for aircraft dealer on Napf. @JoSchaap
[FIXED] Traders now give ItemTinBar in exchange for TrashJackDaniels. @vbawol
[FIXED] M107 zeroing was stuck at 500m now set to default settings. @vbawol
[FIXED] DZE_DamageBeforeMaint = 0.09 by default should fix issues with maintain option not working when damage is set to 0.1 with SQL event. @vbawol
[FIXED] Fix for Death Messages <NULL> when attacker is in vehicle. @icomrade @vbawol
[FIXED] General cleanup and fixes. @Fank @Skaronator @icomrade @vbawol
[FIXED] Added missing DZE fueltracks to DZE_fueltrackarray. @Fank
[FIXED] Fix AI from being counted as zeds. @jwo7777777
[FIXED] Issue with Scaffolding being too close and killing player. @Fank
[FIXED] Stuck in infinite trading loop when item is out of stock. @vbawol
[FIXED] Fixed backpack disappearing issue. @vbawol
@@ -18,8 +24,14 @@
[FIXED] Issue that prevented the server from starting. @Skaronator
[FIXED] Some typos in the loot table. @Skaronator
[FIXED] DZE_MissionLootTable - Some things are missing. @vbawol @Skaronator
[FIXED] General cleanup and fixes. @Fank @Skaronator @icomrade @vbawol
[CHANGED] R3F weight for dutch in Kg @vbawol http://epochmod.com/forum/index.php?/topic/6510-request-r3f-weight-for-dutch-in-kg/
[CHANGED] R3F weight now in Kg for every language except english. @VeryBigBro
[CHANGED] Increased trader prices for Armed vehicles and pipebombs. @vbawol
[CHANGED] Added BAF_Merlin_DZE and MH60S_DZE to traders. @vbawol
[REMOVED] Trade metals option removed from self actions as it should no longer be needed with new trader code. @vbawol
[INFO] Moved binaries to root of server files and wrote up basic install upgrade guide. @vbawol
[INFO] Models/textures by Paul Tomany. @Sequisha.
[INFO] Special thanks to http://bmrf.me/ for hosting our development server.

1
SQF/dayz_code/$PREFIX$ Normal file
View File

@@ -0,0 +1 @@
z\addons\dayz_code

385
SQF/dayz_code/Configs/CfgMagazines/DZE/Currency/Briefcase.hpp
View File

@@ -27,6 +27,22 @@ class ItemBriefcaseEmpty: ItemBriefcase_Base {
output[] = {{"ItemBriefcase100oz",1}};
input[] = {{"ItemBriefcaseEmpty",1},{"ItemGoldBar10oz",10}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS10oz",1}};
input[] = {{"ItemBriefcaseEmpty",1},{"ItemSilverBar10oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_S_198;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseEmpty",1},{"ItemSilverBar10oz",10}};
};
};
};
class ItemBriefcase10oz: ItemBriefcase_Base {
@@ -396,4 +412,373 @@ class ItemBriefcase100oz: ItemBriefcase_Base {
input[] = {{"ItemBriefcase100oz",1}};
};
};
};
// Silver
class ItemBriefcaseS10oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_10oz_CA.paa";
descriptionShort = "Briefcase (Contains: 1 x 10oz Silver Bar)";
weight = 1.2;
worth = 10;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS20oz",1}};
input[] = {{"ItemBriefcaseS10oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_199;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS10oz",1},{"ItemSilverBar10oz",9}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS10oz",1}};
};
};
};
class ItemBriefcaseS20oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_20oz_CA.paa";
descriptionShort = "Briefcase (Contains: 2 x 10oz Silver Bar)";
weight = 1.5;
worth = 20;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS30oz",1}};
input[] = {{"ItemBriefcaseS20oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_202;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS20oz",1},{"ItemSilverBar10oz",8}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS10oz",1}};
input[] = {{"ItemBriefcaseS20oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",2},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS20oz",1}};
};
};
};
class ItemBriefcaseS30oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_30oz_CA.paa";
descriptionShort = "Briefcase (Contains: 3 x 10oz Silver Bar)";
weight = 1.8;
worth = 30;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS40oz",1}};
input[] = {{"ItemBriefcaseS30oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_203;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS30oz",1},{"ItemSilverBar10oz",7}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS20oz",1}};
input[] = {{"ItemBriefcaseS30oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",3},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS30oz",1}};
};
};
};
class ItemBriefcaseS40oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_40oz_CA.paa";
descriptionShort = "Briefcase (Contains: 4 x 10oz Silver Bar)";
weight = 2.1;
worth = 40;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS50oz",1}};
input[] = {{"ItemBriefcaseS40oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_204;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS40oz",1},{"ItemSilverBar10oz",6}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS30oz",1}};
input[] = {{"ItemBriefcaseS40oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",4},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS40oz",1}};
};
};
};
class ItemBriefcaseS50oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_50oz_CA.paa";
descriptionShort = "Briefcase (Contains: 5 x 10oz Silver Bar)";
weight = 2.4;
worth = 50;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS60oz",1}};
input[] = {{"ItemBriefcaseS50oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_205;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS50oz",1},{"ItemSilverBar10oz",5}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS40oz",1}};
input[] = {{"ItemBriefcaseS50oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",5},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS50oz",1}};
};
};
};
class ItemBriefcaseS60oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_60oz_CA.paa";
descriptionShort = "Briefcase (Contains: 6 x 10oz Silver Bar)";
weight = 2.7;
worth = 60;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS70oz",1}};
input[] = {{"ItemBriefcaseS60oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_206;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS60oz",1},{"ItemSilverBar10oz",4}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS50oz",1}};
input[] = {{"ItemBriefcaseS60oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",6},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS60oz",1}};
};
};
};
class ItemBriefcaseS70oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_70oz_CA.paa";
descriptionShort = "Briefcase (Contains: 7 x 10oz Silver Bar)";
weight = 2.9;
worth = 70;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS80oz",1}};
input[] = {{"ItemBriefcaseS70oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_207;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS70oz",1},{"ItemSilverBar10oz",3}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS60oz",1}};
input[] = {{"ItemBriefcaseS70oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",7},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS70oz",1}};
};
};
};
class ItemBriefcaseS80oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_80oz_CA.paa";
descriptionShort = "Briefcase (Contains: 8 x 10oz Silver Bar)";
weight = 3.2;
worth = 80;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS90oz",1}};
input[] = {{"ItemBriefcaseS80oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_208;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS80oz",1},{"ItemSilverBar10oz",2}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS70oz",1}};
input[] = {{"ItemBriefcaseS80oz",1}};
};
class Crafting3 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting3','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",8},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS80oz",1}};
};
};
};
class ItemBriefcaseS90oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_90oz_CA.paa";
descriptionShort = "Briefcase (Contains: 9 x 10oz Silver Bar)";
weight = 3.5;
worth = 90;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_197;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemBriefcaseS100oz",1}};
input[] = {{"ItemBriefcaseS90oz",1},{"ItemSilverBar10oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS80oz",1}};
input[] = {{"ItemBriefcaseS90oz",1}};
};
class Crafting2 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",9},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS90oz",1}};
};
};
};
class ItemBriefcaseS100oz: ItemBriefcase_Base {
picture = "\z\addons\dayz_epoch\pictures\equip_briefcase_100oz_CA.paa";
descriptionShort = "Briefcase (Contains: 10 x 10oz Silver Bar)";
weight = 3.8;
worth = 100;
class ItemActions {
class Crafting {
text = $STR_EPOCH_PLAYER_S_200;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",1},{"ItemBriefcaseS90oz",1}};
input[] = {{"ItemBriefcaseS100oz",1}};
};
class Crafting1 {
text = $STR_EPOCH_PLAYER_201;
script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {};
requiretools[] = {};
output[] = {{"ItemSilverBar10oz",10},{"ItemBriefcaseEmpty",1}};
input[] = {{"ItemBriefcaseS100oz",1}};
};
};
};

60
SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp Normal file
View File

@@ -0,0 +1,60 @@
class BTR90;
class BTR90_DZ: BTR90 {
scope = public;
side = TGuerrila;
displayName = "BTR-90 DZ";
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
crew = "";
typicalCargo[] = {};
class TransportMagazines{};
transportMaxMagazines = 100; // Default: 100
transportMaxWeapons = 10; // Default: 10
//transportmaxbackpacks = ; // Default:
class Turrets; // External class reference
class MainTurret; // External class reference
};
class BTR90_HQ;
class BTR90_HQ_DZ: BTR90_HQ {
scope = public;
side = TGuerrila;
displayName = "BTR-90 (HQ) DZ";
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
crew = "";
typicalCargo[] = {};
class TransportMagazines{};
transportMaxMagazines = 100; // Default: 100
transportMaxWeapons = 10; // Default: 10
//transportmaxbackpacks = ; // Default:
class Turrets; // External class reference
class MainTurret; // External class reference
};
// Ammo Less
class BTR90_DZE: BTR90_DZ {
displayName = "BTR-90 AL";
class Turrets: Turrets {
class MainTurret : MainTurret {
magazines[] = {};
};
};
};
class BTR90_HQ_DZE: BTR90_HQ_DZ {
displayName = "BTR-90 (HQ) AL";
class Turrets: Turrets {
class MainTurret : MainTurret {
magazines[] = {};
};
};
};

60
SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp Normal file
View File

@@ -0,0 +1,60 @@
class LAV25;
class LAV25_DZ: LAV25 {
scope = public;
side = TGuerrila;
displayName = "LAV-25 DZ";
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
crew = "";
typicalCargo[] = {};
class TransportMagazines{};
transportMaxMagazines = 100; // Default: 100
transportMaxWeapons = 10; // Default: 10
//transportmaxbackpacks = ; // Default:
class Turrets; // External class reference
class MainTurret; // External class reference
};
class LAV25_HQ;
class LAV25_HQ_DZ: LAV25_HQ {
scope = public;
side = TGuerrila;
displayName = "LAV-25 (HQ) DZ";
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
crew = "";
typicalCargo[] = {};
class TransportMagazines{};
transportMaxMagazines = 100; // Default: 100
transportMaxWeapons = 10; // Default: 10
//transportmaxbackpacks = ; // Default:
class Turrets; // External class reference
class MainTurret; // External class reference
};
// Ammo Less
class LAV25_DZE: LAV25_DZ {
displayName = "LAV-25 AL";
class Turrets: Turrets {
class MainTurret : MainTurret {
magazines[] = {};
};
};
};
class LAV25_HQ_DZE: LAV25_HQ_DZ {
displayName = "LAV-25 (HQ) AL";
class Turrets: Turrets {
class MainTurret : MainTurret {
magazines[] = {};
};
};
};

63
SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp
View File

@@ -1,3 +1,66 @@
// Armed
class M113_UN_EP1;
class M113_UN_EP1_DZ: M113_UN_EP1 {
scope = public;
side = TGuerrila;
displayName = "M113 DZ";
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
crew = "";
typicalCargo[] = {};
class TransportMagazines{};
transportMaxMagazines = 100; // Default: 100
transportMaxWeapons = 20; // Default: 20
//transportmaxbackpacks = ; // Default:
class Turrets; // External class reference
class MainTurret; // External class reference
};
class M113_TK_EP1;
class M113_TK_EP1_DZ: M113_TK_EP1 {
scope = public;
side = TGuerrila;
displayName = "M113 DZ";
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
crew = "";
typicalCargo[] = {};
class TransportMagazines{};
transportMaxMagazines = 100; // Default: 100
transportMaxWeapons = 20; // Default: 20
//transportmaxbackpacks = ; // Default:
class Turrets; // External class reference
class MainTurret; // External class reference
};
// Ammo Less
class M113_UN_EP1_DZE: M113_UN_EP1_DZ {
displayName = "M113 AL";
class Turrets: Turrets {
class MainTurret : MainTurret {
magazines[] = {};
};
};
};
class M113_TK_EP1_DZE: M113_TK_EP1_DZ {
displayName = "M113 AL";
class Turrets: Turrets {
class MainTurret : MainTurret {
magazines[] = {};
};
};
};
// Unarmed
class M113Ambul_UN_EP1;
class M113Ambul_UN_EP1_DZ: M113Ambul_UN_EP1 {
scope = 2;

4
SQF/dayz_code/Configs/cfgVehicles.hpp
View File

@@ -223,6 +223,8 @@ class CfgVehicles {
#include "CfgVehicles\LAND\ArmoredSUV.hpp"
#include "CfgVehicles\LAND\Pickup_PK.hpp"
#include "CfgVehicles\LAND\Offroad_DSHKM.hpp"
#include "CfgVehicles\LAND\BTR90.hpp"
#include "CfgVehicles\LAND\LAV25.hpp"
// LAND (Unarmed)
#include "CfgVehicles\LAND\V3S.hpp"
@@ -238,6 +240,8 @@ class CfgVehicles {
#include "CfgVehicles\LAND\UAZ.hpp"
#include "CfgVehicles\LAND\SUV.hpp"
#include "CfgVehicles\LAND\TT650.hpp"
// Land (Armed & Unarmed)
#include "CfgVehicles\LAND\M113.hpp"
// SEA

201
SQF/dayz_code/actions/trade_any_bicycle_old.sqf Normal file
View File

@@ -0,0 +1,201 @@
private ["_veh","_location","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true;
// Test cannot lock while another player is nearby
//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
// [part_out,part_in, qty_out, qty_in, loc];
_activatingPlayer = player;
_part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1;
_qty_out = (_this select 3) select 2;
_qty_in = (_this select 3) select 3;
_buy_o_sell = (_this select 3) select 4;
_textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle];
_qty = count _obj;
_bos = 1;
};
if (_qty >= _qty_in) then {
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
// force animation
player playActionNow "Medic";
r_interrupt = false;
_animState = animationState player;
r_doLoop = true;
_started = false;
_finished = false;
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
_started = true;
};
if (_started and !_isMedic) then {
r_doLoop = false;
_finished = true;
};
if (r_interrupt) then {
r_doLoop = false;
};
sleep 0.1;
};
r_doLoop = false;
if (!_finished) exitWith {
r_interrupt = false;
if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"];
};
if (_finished) then {
// Double check for items
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle];
_qty = count _obj;
};
if (_qty >= _qty_in) then {
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
publicVariableServer "PVDZE_obj_Trade";
//diag_log format["DEBUG Starting to wait for answer: %1", PVDZE_obj_Trade];
waitUntil {!isNil "dayzTradeResult"};
//diag_log format["DEBUG Complete Trade: %1", dayzTradeResult];
if(dayzTradeResult == "PASS") then {
if(_buy_o_sell == "buy") then {
_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
if(_removed == _qty_in) then {
_dir = round(random 360);
_helipad = nearestObjects [player, ["HeliHCivil","HeliHempty"], 100];
if(count _helipad > 0) then {
_location = (getPosATL (_helipad select 0));
} else {
_location = [(position player),0,20,1,0,2000,0] call BIS_fnc_findSafePos;
};
//place vehicle spawn marker (local)
_veh = createVehicle ["Sign_arrow_down_large_EP1", _location, [], 0, "CAN_COLLIDE"];
_location = (getPosATL _veh);
//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,true,dayz_characterID,_activatingPlayer];
publicVariableServer "PVDZE_veh_Publish2";
player reveal _veh;
cutText [format[(localize "str_epoch_player_180"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"];
};
} else {
_obj = _obj select 0;
//check to make sure vehicle has no more than 75% average tire damage
_hitpoints = _obj call vehicle_getHitpoints;
_okToSell = true;
// count parts
_tires = 0;
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tires = _tires + 1;
};
} forEach _hitpoints;
// find average tire damage
if(_tireDmg > 0 and _tires > 0) then {
if((_tireDmg / _tires) > 0.75) then {
_okToSell = false;
};
};
if(local _obj) then {
if(_okToSell) then {
if(!isNull _obj and alive _obj) then {
for "_x" from 1 to _qty_out do {
player addMagazine _part_out;
};
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
deleteVehicle _obj;
cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
};
} else {
cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
};
} else {
cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"];
};
};
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = -1;
} else {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
};
dayzTradeResult = nil;
};
};
} else {
_needed = _qty_in - _qty;
if(_buy_o_sell == "buy") then {
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
} else {
cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"];
};
};
DZE_ActionInProgress = false;

194
SQF/dayz_code/actions/trade_any_boat_old.sqf Normal file
View File

@@ -0,0 +1,194 @@
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","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_okToSell","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true;
// Test cannot lock while another player is nearby
//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
// [part_out,part_in, qty_out, qty_in, loc];
_activatingPlayer = player;
_part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1;
_qty_out = (_this select 3) select 2;
_qty_in = (_this select 3) select 3;
_buy_o_sell = (_this select 3) select 4;
_textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_boat];
_qty = count _obj;
_bos = 1;
};
if (_qty >= _qty_in) then {
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
// force animation
player playActionNow "Medic";
r_interrupt = false;
_animState = animationState player;
r_doLoop = true;
_started = false;
_finished = false;
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
_started = true;
};
if (_started and !_isMedic) then {
r_doLoop = false;
_finished = true;
};
if (r_interrupt) then {
r_doLoop = false;
};
sleep 0.1;
};
r_doLoop = false;
if (!_finished) exitWith {
r_interrupt = false;
if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"];
};
if (_finished) then {
// Double check for items
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_boat];
_qty = count _obj;
};
if (_qty >= _qty_in) then {
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
publicVariableServer "PVDZE_obj_Trade";
//diag_log format["DEBUG Starting to wait for answer: %1", PVDZE_obj_Trade];
waitUntil {!isNil "dayzTradeResult"};
//diag_log format["DEBUG Complete Trade: %1", dayzTradeResult];
if(dayzTradeResult == "PASS") then {
if(_buy_o_sell == "buy") then {
// First select key color
_keyColor = ["Green","Red","Blue","Yellow","Black"] call BIS_fnc_selectRandom;
// then select number from 1 - 2500
_keyNumber = (floor(random 2500)) + 1;
// Combine to key (eg.ItemKeyYellow2494) classname
_keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber];
_isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected);
_config = _keySelected;
_isOk = [player,_config] call BIS_fnc_invAdd;
waitUntil {!isNil "_isOk"};
if (_isOk and _isKeyOK) then {
_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
if(_removed == _qty_in) then {
_dir = round(random 360);
_helipad = nearestObjects [player, ["HeliHCivil","HeliHempty"], 100];
if(count _helipad > 0) then {
_location = (getPosATL (_helipad select 0));
} else {
_location = [(position player),0,20,1,2,2000,0] call BIS_fnc_findSafePos;
};
//place vehicle spawn marker (local)
_veh = createVehicle ["Sign_arrow_down_large_EP1", _location, [], 0, "CAN_COLLIDE"];
_location = (getPosATL _veh);
//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
publicVariableServer "PVDZE_veh_Publish2";
player reveal _veh;
cutText [format[("Bought %3 for %1 %2, key added to toolbelt."),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"];
} else {
player removeMagazine _keySelected;
};
} else {
cutText [(localize "str_epoch_player_107"), "PLAIN DOWN"];
};
} else {
_obj = _obj select 0;
_okToSell = true;
if(!local _obj) then {
_okToSell = false;
};
if(_okToSell and !isNull _obj and alive _obj) then {
for "_x" from 1 to _qty_out do {
player addMagazine _part_out;
};
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
deleteVehicle _obj;
cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
} else {
cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"];
};
};
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = -1;
} else {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
};
dayzTradeResult = nil;
};
};
} else {
_needed = _qty_in - _qty;
if(_buy_o_sell == "buy") then {
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
} else {
cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"];
};
};
DZE_ActionInProgress = false;

228
SQF/dayz_code/actions/trade_any_vehicle_old.sqf Normal file
View File

@@ -0,0 +1,228 @@
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","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true;
// Test cannot lock while another player is nearby
//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1;
//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; };
// [part_out,part_in, qty_out, qty_in, loc];
_activatingPlayer = player;
_part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1;
_qty_out = (_this select 3) select 2;
_qty_in = (_this select 3) select 3;
_buy_o_sell = (_this select 3) select 4;
_textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
if (_part_in isKindOf "Air") then {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_air];
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle];
};
_qty = count _obj;
_bos = 1;
};
if (_qty >= _qty_in) then {
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
// force animation
player playActionNow "Medic";
r_interrupt = false;
_animState = animationState player;
r_doLoop = true;
_started = false;
_finished = false;
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
_started = true;
};
if (_started and !_isMedic) then {
r_doLoop = false;
_finished = true;
};
if (r_interrupt) then {
r_doLoop = false;
};
sleep 0.1;
};
r_doLoop = false;
if (!_finished) exitWith {
r_interrupt = false;
if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"];
};
if (_finished) then {
// Double check for items
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
if (_part_in isKindOf "AIR") then {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_air];
} else {
_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle];
};
_qty = count _obj;
};
if (_qty >= _qty_in) then {
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
if (isNil "_obj") then { _obj = "Unknown Vehicle" };
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_obj,inTraderCity];
publicVariableServer "PVDZE_obj_Trade";
//diag_log format["DEBUG Starting to wait for answer: %1", PVDZE_obj_Trade];
waitUntil {!isNil "dayzTradeResult"};
//diag_log format["DEBUG Complete Trade: %1", dayzTradeResult];
if(dayzTradeResult == "PASS") then {
if(_buy_o_sell == "buy") then {
// First select key color
_keyColor = ["Green","Red","Blue","Yellow","Black"] call BIS_fnc_selectRandom;
// then select number from 1 - 2500
_keyNumber = (floor(random 2500)) + 1;
// Combine to key (eg.ItemKeyYellow2494) classname
_keySelected = format[("ItemKey%1%2"),_keyColor,_keyNumber];
_isKeyOK = isClass(configFile >> "CfgWeapons" >> _keySelected);
_config = _keySelected;
_isOk = [player,_config] call BIS_fnc_invAdd;
waitUntil {!isNil "_isOk"};
if (_isOk and _isKeyOK) then {
_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
if(_removed == _qty_in) then {
_dir = round(random 360);
_helipad = nearestObjects [player, ["HeliHCivil","HeliHempty"], 100];
if(count _helipad > 0) then {
_location = (getPosATL (_helipad select 0));
} else {
_location = [(position player),0,20,1,0,2000,0] call BIS_fnc_findSafePos;
};
//place vehicle spawn marker (local)
_veh = createVehicle ["Sign_arrow_down_large_EP1", _location, [], 0, "CAN_COLLIDE"];
_location = (getPosATL _veh);
//["PVDZE_veh_Publish",[_veh,[_dir,_location],_part_out,false,_keySelected]] call callRpcProcedure;
PVDZE_veh_Publish2 = [_veh,[_dir,_location],_part_out,false,_keySelected,_activatingPlayer];
publicVariableServer "PVDZE_veh_Publish2";
cutText [format[("Bought %3 for %1 %2, key added to toolbelt."),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"];
} else {
player removeMagazine _keySelected;
};
} else {
cutText [(localize "str_epoch_player_107"), "PLAIN DOWN"];
};
} else {
_obj = _obj select 0;
//check to make sure vehicle has no more than 75% average tire damage
_hitpoints = _obj call vehicle_getHitpoints;
_okToSell = true;
// count parts
_tires = 0;
// total damage
_tireDmg = 0;
_damage = 0;
{
if(["Wheel",_x,false] call fnc_inString) then {
_damage = [_obj,_x] call object_getHit;
_tireDmg = _tireDmg + _damage;
_tires = _tires + 1;
};
} forEach _hitpoints;
// find average tire damage
if(_tireDmg > 0 and _tires > 0) then {
if((_tireDmg / _tires) > 0.75) then {
_okToSell = false;
};
};
if(local _obj and !isNull _obj and alive _obj) then {
if(_okToSell) then {
for "_x" from 1 to _qty_out do {
player addMagazine _part_out;
};
_objectID = _obj getVariable ["ObjectID","0"];
_objectUID = _obj getVariable ["ObjectUID","0"];
PVDZE_obj_Delete = [_objectID,_objectUID,_activatingPlayer];
publicVariableServer "PVDZE_obj_Delete";
deleteVehicle _obj;
cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
} else {
cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"];
};
} else {
cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"];
};
};
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = -1;
} else {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
};
dayzTradeResult = nil;
};
};
} else {
_needed = _qty_in - _qty;
if(_buy_o_sell == "buy") then {
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
} else {
cutText [format[(localize "str_epoch_player_185"),_textPartIn] , "PLAIN DOWN"];
};
};
DZE_ActionInProgress = false;

135
SQF/dayz_code/actions/trade_backpacks_old.sqf Normal file
View File

@@ -0,0 +1,135 @@
private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_class","_started","_finished","_animState","_isMedic","_num_removed","_needed","_activatingPlayer","_buy_o_sell","_textPartIn","_textPartOut","_traderID"];
// [part_out,part_in, qty_out, qty_in,];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true;
_activatingPlayer = player;
_part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1;
_qty_out = (_this select 3) select 2;
_qty_in = (_this select 3) select 3;
_buy_o_sell = (_this select 3) select 4;
_textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_bos = 1;
_qty = 0;
_bag = unitBackpack player;
_class = typeOf _bag;
if(_class == _part_in) then {
_qty = 1;
};
};
if (_qty >= _qty_in) then {
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
// force animation
player playActionNow "Medic";
r_interrupt = false;
_animState = animationState player;
r_doLoop = true;
_started = false;
_finished = false;
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
_started = true;
};
if (_started and !_isMedic) then {
r_doLoop = false;
_finished = true;
};
if (r_interrupt) then {
r_doLoop = false;
};
sleep 0.1;
};
r_doLoop = false;
if (!_finished) exitWith {
r_interrupt = false;
if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"];
};
if (_finished) then {
// Double check we still have parts
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_qty = 0;
_bag = unitBackpack player;
_class = typeOf _bag;
if(_class == _part_in) then {
_qty = 1;
};
};
if (_qty >= _qty_in) then {
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
if (isNil "_bag") then { _bag = "Unknown Backpack" };
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_bag,inTraderCity];
publicVariableServer "PVDZE_obj_Trade";
//diag_log format["DEBUG Starting to wait for answer: %1", PVDZE_obj_Trade];
waitUntil {!isNil "dayzTradeResult"};
//diag_log format["DEBUG Complete Trade: %1", dayzTradeResult];
if(dayzTradeResult == "PASS") then {
if(_buy_o_sell == "buy") then {
_num_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
if(_num_removed == _qty_in) then {
removeBackpack player;
player addBackpack _part_out;
};
} else {
// Sell
if((typeOf (unitBackpack player)) == _part_in) then {
removeBackpack player;
for "_x" from 1 to _qty_out do {
player addMagazine _part_out;
};
};
};
cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = -1;
} else {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
};
dayzTradeResult = nil;
};
};
} else {
_needed = _qty_in - _qty;
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
};
DZE_ActionInProgress = false;

273
SQF/dayz_code/actions/trade_items_old.sqf Normal file
View File

@@ -0,0 +1,273 @@
private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_needed","_started","_finished","_animState","_isMedic","_total_parts_out","_abort","_removed","_tradeCounter","_next_highest_bar","_third_highest_bar","_next_highest_conv","_third_highest_conv","_third_parts_out_raw","_third_parts_out","_remainder","_next_parts_out_raw","_next_parts_out","_activatingPlayer","_traderID","_total_trades"];
// [part_out,part_in, qty_out, qty_in,];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"] };
DZE_ActionInProgress = true;
_total_parts_out = 0;
_activatingPlayer = player;
_part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1;
_qty_out = (_this select 3) select 2;
_qty_in = (_this select 3) select 3;
_buy_o_sell = (_this select 3) select 4;
_textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_removed = 0;
_tradeCounter = 0;
_bos = 0;
if(_buy_o_sell == "sell") then {
_bos = 1;
};
// Get total parts in
_qty = {_x == _part_in} count magazines player;
// Find number of possible trades
_total_trades = floor(_qty / _qty_in);
_abort = false;
if(_total_trades < 1) exitWith {
_needed = _qty_in - _qty;
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
DZE_ActionInProgress = false;
};
// perform number of total trades
for "_x" from 1 to _total_trades do {
_removed = 0;
_tradeCounter = _tradeCounter + 1;
// cutText ["Starting trade, stand still to complete.", "PLAIN DOWN"];
if(_total_trades == 1) then {
cutText [format[(localize "str_epoch_player_105"),_tradeCounter,_total_trades] , "PLAIN DOWN"];
} else {
cutText [format[(localize "str_epoch_player_187"),_tradeCounter,_total_trades] , "PLAIN DOWN"];
};
[1,1] call dayz_HungerThirst;
player playActionNow "Medic";
//_dis=20;
//_sfx = "repair";
//[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
//[player,_dis,true,(getPosATL player)] spawn player_alertZombies;
r_interrupt = false;
_animState = animationState player;
r_doLoop = true;
_started = false;
_finished = false;
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
_started = true;
};
if (_started and !_isMedic) then {
r_doLoop = false;
_finished = true;
};
if (r_interrupt) then {
r_doLoop = false;
};
sleep 0.1;
};
r_doLoop = false;
if (!_finished) exitWith {
r_interrupt = false;
if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"];
};
if (_finished) then {
_qty = {_x == _part_in} count magazines player;
if (_qty >= _qty_in) then {
_part_inClass = configFile >> "CfgMagazines" >> _part_in;
_removed = _removed + ([player,_part_inClass,_qty_in] call BIS_fnc_invRemove);
if (_removed == _qty_in) then {
// Continue with trade.
if (isNil "_part_in") then { _part_in = "Unknown Item" };
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_in,inTraderCity];
publicVariableServer "PVDZE_obj_Trade";
waitUntil {!isNil "dayzTradeResult"};
if(dayzTradeResult == "PASS") then {
// total of all parts
_total_parts_out = _total_parts_out + _qty_out;
cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
} else {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
_abort = true;
// Return items taken
for "_x" from 1 to _removed do {
player addMagazine _part_in;
};
};
dayzTradeResult = nil;
} else {
// Return items from botched trade.
for "_x" from 1 to _removed do {
player addMagazine _part_in;
};
_abort = true;
};
} else {
_needed = _qty_in - _qty;
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
};
};
sleep 1;
if(_abort) exitWith {};
};
// pay out
if(_total_parts_out >= 1) then {
//diag_log format["DEBUG TRADE #: %1", _total_parts_out];
if(_bos == 1) then {
//convert currency trades into next bar
// 10 ItemCopperBar > ItemCopperBar10oz
// 3 ItemCopperBar10oz > ItemSilverBar
// 10 ItemSilverBar > ItemSilverBar10oz
// 3 ItemSilverBar10oz > ItemGoldBar
// 10 ItemGoldBar > ItemGoldBar10oz
_next_highest_bar = "NA";
_third_highest_bar = "NA";
_next_highest_conv = 10000;
_third_highest_conv = 10000;
switch(true)do{
case (_part_out == "ItemCopperBar"): {
_next_highest_bar = "ItemCopperBar10oz";
_third_highest_bar = "ItemSilverBar";
_next_highest_conv = 10;
_third_highest_conv = 3;
};
case (_part_out == "ItemCopperBar10oz"): {
_next_highest_bar = "ItemSilverBar";
_third_highest_bar = "ItemSilverBar10oz";
_next_highest_conv = 3;
_third_highest_conv = 10;
};
case (_part_out == "ItemSilverBar"): {
_next_highest_bar = "ItemSilverBar10oz";
_third_highest_bar = "ItemGoldBar";
_next_highest_conv = 10;
_third_highest_conv = 3;
};
case (_part_out == "ItemSilverBar10oz"): {
_next_highest_bar = "ItemGoldBar";
_third_highest_bar = "ItemGoldBar10oz";
_next_highest_conv = 3;
_third_highest_conv = 10;
};
case (_part_out == "ItemGoldBar"): {
_next_highest_bar = "ItemGoldBar10oz";
_third_highest_bar = "NA";
_next_highest_conv = 10;
_third_highest_conv = 10000;
};
};
//diag_log format["DEBUG TRADE part: %1 next: %2", _part_out,_next_highest_bar];
if(_total_parts_out >= _next_highest_conv) then {
_next_parts_out_raw = _total_parts_out / _next_highest_conv;
// whole parts
_next_parts_out = floor(_next_parts_out_raw);
//diag_log format["DEBUG TRADE next whole parts: %1 part: %2", _next_parts_out,_next_highest_bar];
// find any whole remains
_remainder = floor((_next_parts_out_raw - _next_parts_out) * _next_highest_conv);
//diag_log format["DEBUG TRADE remainder parts: %1 part: %2", _remainder,_part_out];
for "_x" from 1 to _remainder do {
player addMagazine _part_out;
};
// Find if needs further conversion
if (_next_parts_out >= _third_highest_conv) then {
_third_parts_out_raw = _next_parts_out / _third_highest_conv;
// whole parts
_third_parts_out = floor(_third_parts_out_raw);
//diag_log format["DEBUG TRADE third whole parts: %1 part: %2", _third_parts_out,_third_highest_bar];
for "_x" from 1 to _third_parts_out do {
player addMagazine _third_highest_bar;
};
// find any whole remains
_remainder = floor((_third_parts_out_raw - _third_parts_out) * _third_highest_conv);
//diag_log format["DEBUG TRADE remainder parts: %1 part: %2", _remainder,_next_highest_bar];
for "_x" from 1 to _remainder do {
player addMagazine _next_highest_bar;
};
} else {
//diag_log format["DEBUG TRADE next parts: %1 part: %2", _next_parts_out,_next_highest_bar];
for "_x" from 1 to _next_parts_out do {
player addMagazine _next_highest_bar;
};
};
} else {
//diag_log "DEBUG TRADE SELLING NORMALLY";
for "_x" from 1 to _total_parts_out do {
player addMagazine _part_out;
};
};
} else {
//diag_log "DEBUG TRADE BUYING";
for "_x" from 1 to _total_parts_out do {
player addMagazine _part_out;
};
};
};
DZE_ActionInProgress = false;

125
SQF/dayz_code/actions/trade_weapons_old.sqf Normal file
View File

@@ -0,0 +1,125 @@
private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"];
// [part_out,part_in, qty_out, qty_in,"buy"];
if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; };
DZE_ActionInProgress = true;
_activatingPlayer = player;
_part_out = (_this select 3) select 0;
_part_in = (_this select 3) select 1;
_qty_out = (_this select 3) select 2;
_qty_in = (_this select 3) select 3;
_buy_o_sell = (_this select 3) select 4;
_textPartIn = (_this select 3) select 5;
_textPartOut = (_this select 3) select 6;
_traderID = (_this select 3) select 7;
_bos = 0;
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_qty = {_x == _part_in} count weapons player;
_bos = 1;
};
if (_qty >= _qty_in) then {
cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"];
[1,1] call dayz_HungerThirst;
// force animation
player playActionNow "Medic";
//_dis=20;
//_sfx = "repair";
//[player,_sfx,0,false,_dis] call dayz_zombieSpeak;
//[player,_dis,true,(getPosATL player)] spawn player_alertZombies;
r_interrupt = false;
_animState = animationState player;
r_doLoop = true;
_started = false;
_finished = false;
while {r_doLoop} do {
_animState = animationState player;
_isMedic = ["medic",_animState] call fnc_inString;
if (_isMedic) then {
_started = true;
};
if (_started and !_isMedic) then {
r_doLoop = false;
_finished = true;
};
if (r_interrupt) then {
r_doLoop = false;
};
sleep 0.1;
};
r_doLoop = false;
if (!_finished) exitWith {
r_interrupt = false;
if (vehicle player == player) then {
[objNull, player, rSwitchMove,""] call RE;
player playActionNow "stop";
};
cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"];
};
if (_finished) then {
// double check for all parts
if(_buy_o_sell == "buy") then {
_qty = {_x == _part_in} count magazines player;
} else {
_qty = {_x == _part_in} count weapons player;
};
if (_qty >= _qty_in) then {
//["PVDZE_obj_Trade",[_activatingPlayer,_traderID,_bos]] call callRpcProcedure;
if (isNil "_part_out") then { _part_out = "Unknown Weapon/Magazine" };
if (isNil "inTraderCity") then { inTraderCity = "Unknown Trader City" };
PVDZE_obj_Trade = [_activatingPlayer,_traderID,_bos,_part_out,inTraderCity];
publicVariableServer "PVDZE_obj_Trade";
waitUntil {!isNil "dayzTradeResult"};
//diag_log format["DEBUG Complete Trade: %1", dayzTradeResult];
if(dayzTradeResult == "PASS") then {
_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
if(_removed == _qty_in) then {
for "_x" from 1 to _qty_out do {
if(_buy_o_sell == "buy") then {
player addWeapon _part_out;
} else {
player addMagazine _part_out;
};
};
cutText [format[(localize "str_epoch_player_186"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
};
{player removeAction _x} forEach s_player_parts;s_player_parts = [];
s_player_parts_crtl = -1;
} else {
cutText [format[(localize "str_epoch_player_183"),_textPartOut] , "PLAIN DOWN"];
};
dayzTradeResult = nil;
};
};
} else {
_needed = _qty_in - _qty;
cutText [format[(localize "str_epoch_player_184"),_needed,_textPartIn] , "PLAIN DOWN"];
};
DZE_ActionInProgress = false;

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

@@ -107,9 +107,12 @@ if (_canAfford) then {
};
};
if (_silver_10oz > 0) then {
for "_x" from 1 to _silver_10oz do {
if (_silver_10oz == 1) then {
player addMagazine "ItemSilverBar10oz";
diag_log format["DEBUG TRADER CHANG MADE: %1 x %2", _silver_10oz, "ItemSilverBar10z"];
diag_log format["DEBUG TRADER CHANG MADE: %1 x %2", _silver_10oz, "ItemSilverBar10oz"];
} else {
player addMagazine format["ItemBriefcaseS%1oz",floor(_silver_10oz*10)];
diag_log format["DEBUG TRADER CHANG MADE: ItemBriefcaseS%1oz", floor(_silver_10oz*10)];
};
};
if (_silver_1oz > 0) then {

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

@@ -767,13 +767,9 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
s_player_parts set [count s_player_parts,_buy];
} forEach (_traderMenu select 1);
// Database menu
_buy = player addAction [localize "STR_EPOCH_PLAYER_289", "\z\addons\dayz_code\actions\show_dialog.sqf",(_traderMenu select 0), 99, true, false, "",""];
// Database menu
_buy = player addAction [localize "STR_EPOCH_PLAYER_289", "\z\addons\dayz_code\actions\show_dialog.sqf",(_traderMenu select 0), 999, true, false, "",""];
s_player_parts set [count s_player_parts,_buy];
// Add static metals trader options under sub menu
_metals_trader = player addAction [localize "STR_EPOCH_PLAYER_301", "\z\addons\dayz_code\actions\trade_metals.sqf",["na"], 0, true, false, "",""];
s_player_parts set [count s_player_parts,_metals_trader];
};
s_player_parts_crtl = 1;

3
SQF/dayz_code/config.cpp
View File

@@ -129,7 +129,4 @@ class RscStructuredTextGUI: RscStructuredText
#include "Configs\CfgBuildingLoot\CfgBuildingLoot.hpp"
#include "Configs\CfgArma.hpp"
//#include "Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h"

6
SQF/dayz_epoch_b/CfgServerTrader/Category/BanditHelicopterArmed.hpp
View File

@@ -1,7 +1,7 @@
class Category_512 {
class CH_47F_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemBriefcase100oz"};
buy[] = {4,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class UH1H_DZE {
@@ -11,8 +11,8 @@ class Category_512 {
};
class Mi17_DZE {
type = "trade_any_vehicle";
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
buy[] = {2,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class UH60M_EP1_DZE {
type = "trade_any_vehicle";

38
SQF/dayz_epoch_b/CfgServerTrader/Category/BanditMilitaryArmed.hpp
View File

@@ -1,32 +1,32 @@
class Category_569 {
class HMMWV_M998A2_SOV_DES_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {4,"ItemGoldBar10oz"};
sell[] = {2,"ItemGoldBar10oz"};
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class HMMWV_M1151_M2_CZ_DES_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
buy[] = {4,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class LandRover_Special_CZ_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar10oz"};
};
class LandRover_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar10oz"};
};
class UAZ_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar10oz"};
};
class GAZ_Vodnik_DZE {
type = "trade_any_vehicle";
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class LandRover_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {6,"ItemGoldBar10oz"};
sell[] = {3,"ItemGoldBar10oz"};
};
class UAZ_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {6,"ItemGoldBar10oz"};
sell[] = {3,"ItemGoldBar10oz"};
};
class GAZ_Vodnik_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
};

4
SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyCargoTrucks.hpp
View File

@@ -32,7 +32,7 @@ class Category_564 {
class MTVR_DES_EP1 {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar10oz"};
};
class V3S_Civ {
type = "trade_any_vehicle";
@@ -104,7 +104,7 @@ class Category_570 {
class MTVR_DES_EP1 {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar10oz"};
};
class V3S_Civ {
type = "trade_any_vehicle";

8
SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyMilitaryUnarmed.hpp
View File

@@ -21,8 +21,8 @@ class Category_491 {
};
class GAZ_Vodnik_MedEvac {
type = "trade_any_vehicle";
buy[] = {9,"ItemGoldBar10oz"};
sell[] = {6,"ItemGoldBar10oz"};
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class HMMWV_DZ {
type = "trade_any_vehicle";
@@ -63,8 +63,8 @@ class Category_599 {
};
class GAZ_Vodnik_MedEvac {
type = "trade_any_vehicle";
buy[] = {9,"ItemGoldBar10oz"};
sell[] = {6,"ItemGoldBar10oz"};
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class HMMWV_DZ {
type = "trade_any_vehicle";

6
SQF/dayz_epoch_b/CfgServerTrader/Category/HeroHelicopterArmed.hpp
View File

@@ -1,7 +1,7 @@
class Category_493 {
class CH_47F_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemBriefcase100oz"};
buy[] = {4,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class UH1H_DZE {
@@ -11,8 +11,8 @@ class Category_493 {
};
class Mi17_DZE {
type = "trade_any_vehicle";
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
buy[] = {2,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class UH60M_EP1_DZE {
type = "trade_any_vehicle";

38
SQF/dayz_epoch_b/CfgServerTrader/Category/HeroMilitaryArmed.hpp
View File

@@ -1,32 +1,32 @@
class Category_562 {
class HMMWV_M998A2_SOV_DES_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {4,"ItemGoldBar10oz"};
sell[] = {2,"ItemGoldBar10oz"};
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class HMMWV_M1151_M2_CZ_DES_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
buy[] = {4,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class LandRover_Special_CZ_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar10oz"};
};
class LandRover_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar10oz"};
};
class UAZ_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar10oz"};
};
class GAZ_Vodnik_DZE {
type = "trade_any_vehicle";
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class LandRover_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {6,"ItemGoldBar10oz"};
sell[] = {3,"ItemGoldBar10oz"};
};
class UAZ_MG_TK_EP1_DZE {
type = "trade_any_vehicle";
buy[] = {6,"ItemGoldBar10oz"};
sell[] = {3,"ItemGoldBar10oz"};
};
class GAZ_Vodnik_DZE {
type = "trade_any_vehicle";
buy[] = {2,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
};

4
SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralCargoTrucks.hpp
View File

@@ -32,7 +32,7 @@ class Category_653 {
class MTVR_DES_EP1 {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar10oz"};
};
class V3S_Civ {
type = "trade_any_vehicle";
@@ -104,7 +104,7 @@ class Category_586 {
class MTVR_DES_EP1 {
type = "trade_any_vehicle";
buy[] = {2,"ItemGoldBar10oz"};
sell[] = {1,"ItemGoldBar"};
sell[] = {1,"ItemGoldBar10oz"};
};
class V3S_Civ {
type = "trade_any_vehicle";

2
SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralExplosives.hpp
View File

@@ -6,7 +6,7 @@ class Category_529 {
};
class PipeBomb {
type = "trade_items";
buy[] = {4,"ItemGoldBar10oz"};
buy[] = {4,"ItemBriefcase100oz"};
sell[] = {2,"ItemGoldBar10oz"};
};
class 1Rnd_HE_M203 {

4
SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralHelicopterUnarmed.hpp
View File

@@ -1,8 +1,8 @@
class Category_519 {
class Mi17_Civilian_DZ {
type = "trade_any_vehicle";
buy[] = {4,"ItemGoldBar10oz"};
sell[] = {2,"ItemGoldBar10oz"};
buy[] = {2,"ItemBriefcase100oz"};
sell[] = {1,"ItemBriefcase100oz"};
};
class AH6X_DZ {
type = "trade_any_vehicle";

8
SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralMilitaryUnarmed.hpp
View File

@@ -21,8 +21,8 @@ class Category_658 {
};
class GAZ_Vodnik_MedEvac {
type = "trade_any_vehicle";
buy[] = {9,"ItemGoldBar10oz"};
sell[] = {6,"ItemGoldBar10oz"};
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class HMMWV_DZ {
type = "trade_any_vehicle";
@@ -63,8 +63,8 @@ class Category_598 {
};
class GAZ_Vodnik_MedEvac {
type = "trade_any_vehicle";
buy[] = {9,"ItemGoldBar10oz"};
sell[] = {6,"ItemGoldBar10oz"};
buy[] = {1,"ItemBriefcase100oz"};
sell[] = {5,"ItemGoldBar10oz"};
};
class HMMWV_DZ {
type = "trade_any_vehicle";

110
SQF/dayz_epoch_b/stringtable.xml
View File

@@ -4786,6 +4786,116 @@
<!-- <French></French> -->
<Czech>Přidat 2 10oz zlata</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_S_197">
<Original>Add 1 10oz Silver</Original>
<English>Add 1 10oz Silver</English>
<!-- <German>1 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 1 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 1 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 1 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_198">
<Original>Add 10 10oz Silver</Original>
<English>Add 10 10oz Silver</English>
<!-- <German>10 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 10 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 10 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 10 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_199">
<Original>Add 9 10oz Silver</Original>
<English>Add 9 10oz Silver</English>
<!-- <German>9 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 9 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 9 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 9 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_200">
<Original>Remove 1 10oz Silver</Original>
<English>Remove 1 10oz Silver</English>
<!-- <German>1 10oz Silver entfernen</German> -->
<!-- <Russian>Забрать 1 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Verwijder 1 10oz Goud</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Odebráno 1 10oz zlato</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_202">
<Original>Add 8 10oz Silver</Original>
<English>Add 8 10oz Silver</English>
<!-- <German>8 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 8 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 8 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 8 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_203">
<Original>Add 7 10oz Silver</Original>
<English>Add 7 10oz Silver</English>
<!-- <German>7 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 7 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 7 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 7 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_204">
<Original>Add 6 10oz Silver</Original>
<English>Add 6 10oz Silver</English>
<!-- <German>6 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 6 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 6 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 6 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_205">
<Original>Add 5 10oz Silver</Original>
<English>Add 5 10oz Silver</English>
<!-- <German>5 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 5 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 5 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidáno 5 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_206">
<Original>Add 4 10oz Silver</Original>
<English>Add 4 10oz Silver</English>
<!-- <German>4 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 4 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 4 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidat 4 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_207">
<Original>Add 3 10oz Silver</Original>
<English>Add 3 10oz Silver</English>
<!-- <German>3 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 3 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 3 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Prodat 3 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_S_208">
<Original>Add 2 10oz Silver</Original>
<English>Add 2 10oz Silver</English>
<!-- <German>2 10oz Silver hinzufügen</German> -->
<!-- <Russian>Добавить 2 10oz золота</Russian> -->
<!-- <Spanish></Spanish> -->
<!-- <Dutch>Voeg 2 10oz Goud toe</Dutch> -->
<!-- <French></French> -->
<!-- <Czech>Přidat 2 10oz zlata</Czech> -->
</Key>
<Key ID="STR_EPOCH_PLAYER_209">
<Original>Open %1</Original>
<English>Open %1</English>

0
SQF/dayz_server/$PBOPREFIX$ → SQF/dayz_server/$PREFIX$
View File

1
SQF/dayz_server/PboPrefix.txt
View File

@@ -1 +0,0 @@
z\addons\dayz_server

BIN
Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo
View File

Binary file not shown.

6
Server Files/MPMissions/DayZ_Epoch_16.Panthera2/server_traders.sqf
View File

@@ -27,7 +27,7 @@ menu_CZ_Special_Forces_MG_DES_EP1 = [
// General Store P
menu_Damsel5 = [
[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// Weapons neutral 1P
@@ -87,7 +87,7 @@ menu_Rita_Ensler_EP1 = [
// Neutral General Store 1P
menu_RU_Farmwife1 = [
[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// Medical Supplies P
@@ -117,7 +117,7 @@ menu_UN_CDF_Soldier_AAT_EP1 = [
// General Store 2P
menu_ValentinaVictim = [
[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// North Wholesaler P

4
Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/server_traders.sqf
View File

@@ -87,7 +87,7 @@ menu_UN_CDF_Soldier_Pilot_EP1 = [
// General Store 2
menu_RU_WorkWoman1 = [
[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
"friendly"
];
// Medical Supplies
@@ -105,7 +105,7 @@ menu_RU_Citizen4 = [
// General Store 3
menu_RU_WorkWoman5 = [
[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Whiskey Bottle","Copper Bar",101]],
"neutral"
];
// West Wholesaler

6
Server Files/MPMissions/DayZ_Epoch_24.Napf/server_traders.sqf
View File

@@ -27,7 +27,7 @@ menu_GUE_Commander = [
// General Store
menu_Damsel3 = [
[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// Weapons neutral
@@ -81,7 +81,7 @@ menu_GUE_Villager3 = [
// General Store 2
menu_CIV_EuroWoman01_EP1 = [
[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"friendly"
];
// Medical Supplies
@@ -99,7 +99,7 @@ menu_RUS_Commander = [
// General Store 3
menu_Damsel5 = [
[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// West Wholesaler

6
Server Files/MPMissions/DayZ_Epoch_25.sauerland/server_traders.sqf
View File

@@ -27,7 +27,7 @@ menu_RU_Profiteer1 = [
// Friendly General Store
menu_Damsel4 = [
[["Backpacks",496],["Clothes",497],["Cooked Meats",580],["Drinks",498],["Packaged Food",579]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"friendly"
];
// Weapons neutral
@@ -87,7 +87,7 @@ menu_Profiteer1 = [
// Neutral General Store
menu_RU_Damsel5 = [
[["Backpacks",538],["Clothes",628],["Cooked Meats",630],["Drinks",601],["Packaged Food",629]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// Medical Supplies
@@ -117,7 +117,7 @@ menu_Soldier_MG_PMC = [
// Neutral General Store
menu_RU_Damsel2 = [
[["Backpacks",632],["Clothes",631],["Cooked Meats",634],["Drinks",633],["Packaged Food",635]],
[["ItemCopperBar","TrashJackDaniels",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
[["ItemTinBar","TrashJackDaniels"",1,1,"buy","Empty Wiskey Bottle","Copper Bar",101]],
"neutral"
];
// South Wholesaler

817
Server Files/SQL/epoch.sql
View File

File diff suppressed because it is too large Load Diff

4
Tools/TraderMigration/serverTraders2cfg.pl
View File

@@ -6,8 +6,8 @@ use JSON;
use Data::Dumper;
my $pathServerTradersSQF = '..\..\Server Files\MPMissions\DayZ_Epoch_17.Chernarus\server_traders.sqf';
my $pathServerTradersCfg = '..\..\SQF\dayz_code\Configs\CfgServerTrader\\';
my $pathServerTraderCategoriesCfg = '..\..\SQF\dayz_code\Configs\CfgServerTrader\Category\\';
my $pathServerTradersCfg = '..\..\SQF\dayz_epoch_b\CfgServerTrader\\';
my $pathServerTraderCategoriesCfg = '..\..\SQF\dayz_epoch_b\CfgServerTrader\Category\\';
my $MySQL = DBI->connect('DBI:mysql:host=localhost;database=test2', 'root', 'root');
open(TRADERSQF, '<', $pathServerTradersSQF) or die $!;

3338
TraderCitySources/NAPFtradercities.Napf/mission.biedi Normal file
View File

File diff suppressed because it is too large Load Diff