diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 4ef47c5a5..8db3886e8 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -9,6 +9,7 @@ - Bandit heartbeat sound is disabled by default. Set DZE_HeartBeat = true; in init.sqf to enable - Knife dulling is disabled by default. Set dayz_knifeDulling = true; in init.sqf to enable - Match stick counting is disabled by default. Set dayz_matchboxCount = true; in init.sqf to enable + - Tool breaking is disabled by default. Set dayz_toolBreaking = true; in init.sqf to enable - Water bottle breaking is disabled by default. Set dayz_waterBottleBreaking = true; in init.sqf to enable - Mission.sqm and description.ext now use compact format - Keyboard eventhandler updated, dayz_spaceInterupt is no longer used diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp index 42f565d1d..b665990a8 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Construction.hpp @@ -11,8 +11,9 @@ Construction[] = {Loot_WEAPON, 1, ItemPickaxe}, {Loot_WEAPON, 2, ItemPickaxeBroken}, - {Loot_WEAPON, 1, ItemSledgeHammer}, - {Loot_WEAPON, 2, ItemSledgeHammerBroken}, + {Loot_WEAPON, 1, ItemSledge}, + {Loot_MAGAZINE, 2, ItemSledgeHandle}, + {Loot_MAGAZINE, 2, ItemSledgeHead}, // {Loot_WEAPON, 2, ItemShovel}, {Loot_WEAPON, 1, ItemKeyKit}, diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp index de1fe5930..cb8554369 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Industrial.hpp @@ -10,8 +10,9 @@ Industrial[] = {Loot_VEHICLE, 5, WeaponHolder_ItemHatchet}, {Loot_WEAPON, 1, ItemPickaxe}, {Loot_WEAPON, 2, ItemPickaxeBroken}, - {Loot_WEAPON, 1, ItemSledgeHammer}, - {Loot_WEAPON, 2, ItemSledgeHammerBroken}, + {Loot_WEAPON, 1, ItemSledge}, + {Loot_MAGAZINE, 2, ItemSledgeHandle}, + {Loot_MAGAZINE, 2, ItemSledgeHead}, {Loot_WEAPON, 1, ItemKeyKit}, //Items diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp index da879adfd..fd4892702 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp @@ -60,13 +60,13 @@ submachinegun[] = { {Loot_WEAPON, 0.7, MP5_SD_DZ} //MP5SD }; assaultrifles[] = { - {Loot_WEAPON, 0.5, AKS74U_Kobra_DZ}, //AKS_74_kobra + {Loot_WEAPON, 0.5, AK74_Kobra_DZ}, //AKS_74_kobra (stock is slightly different, otherwise identical) {Loot_WEAPON, 0.5, AKS74U_DZ}, //AKS_74_U {Loot_WEAPON, 0.1, AKS_GOLD}, {Loot_WEAPON, 0.5, AKM_DZ}, //AK_47_M {Loot_WEAPON, 0.5, AK74_DZ}, //AK_74 {Loot_WEAPON, 0.3, FNFAL_DZ}, //FN_FAL - {Loot_WEAPON, 0.1, FNFAL_ANPVS4_DZ}, //FN_FAL_ANPVS4 + {Loot_WEAPON, 0.1, FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable {Loot_WEAPON, 0.5, G36A_Camo_DZ}, //G36A_camo {Loot_WEAPON, 0.5, G36C_DZ}, //G36C {Loot_WEAPON, 0.5, G36C_camo}, @@ -74,16 +74,18 @@ assaultrifles[] = { {Loot_WEAPON, 0.3, G36_C_SD_camo}, {Loot_WEAPON, 0.5, M16A2_DZ}, //M16A2 {Loot_WEAPON, 0.2, M16A2_GL_DZ}, //M16A2GL - {Loot_WEAPON, 0.1, M16A4_DZ}, //M16A4_ACG + {Loot_WEAPON, 0.1, M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope) {Loot_WEAPON, 0.5, M4A1_DZ}, //M4A1 {Loot_WEAPON, 0.4, M4A1_CCO_DZ}, //M4A1_Aim {Loot_WEAPON, 0.1, M4A1_AIM_SD_camo}, {Loot_WEAPON, 0.1, M4A1_HWS_GL_camo}, {Loot_WEAPON, 0.4, M4A3_CCO_EP1}, - {Loot_WEAPON, 0.4, SA58_DZ}, //Sa58P_EP1,Sa58V_EP1 - {Loot_WEAPON, 0.3, SA58_CCO_DZ}, //Sa58V_CCO_EP1 - {Loot_WEAPON, 0.3, SA58_ACOG_DZ}, //Sa58V_RCO_EP1 - {Loot_WEAPON, 0.3, SA58_RIS_DZ}, + {Loot_WEAPON, 0.4, SA58_DZ}, //Sa58P_EP1 (identical), Sa58V_EP1 (different stock) + {Loot_WEAPON, 0.3, SA58_CCO_DZ}, //No camo, no grip handle + {Loot_WEAPON, 0.3, Sa58V_CCO_EP1}, //Camo with grip handle + {Loot_WEAPON, 0.3, SA58_ACOG_DZ}, //No camo, no grip handle + {Loot_WEAPON, 0.3, Sa58V_RCO_EP1}, // Camo with grip handle + {Loot_WEAPON, 0.3, SA58_RIS_DZ}, //SA58_DZ with different rail {Loot_WEAPON, 0.4, m8_compact}, {Loot_WEAPON, 0.3, m8_sharpshooter}, {Loot_WEAPON, 0.5, m8_holo_sd}, @@ -95,9 +97,9 @@ assaultrifles[] = { machineguns[] = { {Loot_WEAPON, 1.1, RPK74_DZ}, //RPK_74 {Loot_WEAPON, 1.1, M8_SAW}, - {Loot_WEAPON, 1, PKM_DZ}, //Pecheneg_DZ - {Loot_WEAPON, 1, UK59_DZ}, //PK_DZ - {Loot_WEAPON, 0.9, L110A1_DZ}, + {Loot_WEAPON, 1, Pecheneg_DZ}, + {Loot_WEAPON, 1, PKM_DZ}, //PK_DZ + {Loot_WEAPON, 0.9, L110A1_DZ}, //BAF_L110A1_Aim_DZE scope is slightly different from L110A1_CCO_DZ, otherwise identical {Loot_WEAPON, 1, MG36_camo}, {Loot_WEAPON, 1, M60A4_EP1_DZE}, {Loot_WEAPON, 1, MG36}, @@ -106,7 +108,7 @@ machineguns[] = { {Loot_WEAPON, 0.8, M240_DZ}, {Loot_WEAPON, 0.8, M249_EP1_DZ}, {Loot_WEAPON, 0.9, M249_DZ}, - {Loot_WEAPON, 0.5, Mk48_DZ} //Mk_48_DZ + {Loot_WEAPON, 0.5, Mk48_DZ} //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ) }; militaryshotguns[] = { {Loot_WEAPON, 2, Saiga12K}, diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp index a568e3b27..6758bd967 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/datsun.hpp @@ -5,7 +5,7 @@ class datsun1_civil_1_open_DZE: datsun1_civil_1_open { class Upgrades { ItemORP[] = {"datsun1_civil_1_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_2_covered; @@ -15,7 +15,7 @@ class datsun1_civil_2_covered_DZE: datsun1_civil_2_covered { class Upgrades { ItemORP[] = {"datsun1_civil_2_covered_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_3_open; @@ -25,7 +25,7 @@ class datsun1_civil_3_open_DZE: datsun1_civil_3_open { class Upgrades { ItemORP[] = {"datsun1_civil_3_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; - ItemARM[] = {"Pickup_PK_INS_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -48,7 +48,7 @@ class datsun1_civil_1_open_DZE1: datsun1_civil_1_open_DZE { class Upgrades { ItemAVE[] = {"datsun1_civil_1_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_2_covered_DZE1: datsun1_civil_2_covered_DZE { @@ -69,7 +69,7 @@ class datsun1_civil_2_covered_DZE1: datsun1_civil_2_covered_DZE { class Upgrades { ItemAVE[] = {"datsun1_civil_2_covered_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_3_open_DZE1: datsun1_civil_3_open_DZE { @@ -90,7 +90,7 @@ class datsun1_civil_3_open_DZE1: datsun1_civil_3_open_DZE { class Upgrades { ItemAVE[] = {"datsun1_civil_3_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; - ItemARM[] = {"Pickup_PK_INS_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -141,7 +141,7 @@ class datsun1_civil_1_open_DZE2: datsun1_civil_1_open_DZE1 { class Upgrades { ItemLRK[] = {"datsun1_civil_1_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_2_covered_DZE2: datsun1_civil_2_covered_DZE1 { @@ -190,7 +190,7 @@ class datsun1_civil_2_covered_DZE2: datsun1_civil_2_covered_DZE1 { class Upgrades { ItemLRK[] = {"datsun1_civil_2_covered_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_3_open_DZE2: datsun1_civil_3_open_DZE1 { @@ -239,7 +239,7 @@ class datsun1_civil_3_open_DZE2: datsun1_civil_3_open_DZE1 { class Upgrades { ItemLRK[] = {"datsun1_civil_3_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; - ItemARM[] = {"Pickup_PK_INS_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -251,7 +251,7 @@ class datsun1_civil_1_open_DZE3: datsun1_civil_1_open_DZE2 { class Upgrades { ItemTNK[] = {"datsun1_civil_1_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_2_covered_DZE3: datsun1_civil_2_covered_DZE2 { @@ -261,7 +261,7 @@ class datsun1_civil_2_covered_DZE3: datsun1_civil_2_covered_DZE2 { class Upgrades { ItemTNK[] = {"datsun1_civil_2_covered_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_3_open_DZE3: datsun1_civil_3_open_DZE2 { @@ -271,7 +271,7 @@ class datsun1_civil_3_open_DZE3: datsun1_civil_3_open_DZE2 { class Upgrades { ItemTNK[] = {"datsun1_civil_3_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; - ItemARM[] = {"Pickup_PK_INS_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -280,20 +280,20 @@ class datsun1_civil_1_open_DZE4: datsun1_civil_1_open_DZE3 { fuelCapacity = 210; // car 100 class Upgrades { - ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_2_covered_DZE4: datsun1_civil_2_covered_DZE3 { fuelCapacity = 210; // car 100 class Upgrades { - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class datsun1_civil_3_open_DZE4: datsun1_civil_3_open_DZE3 { fuelCapacity = 210; // car 100 class Upgrades { - ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp index 6d8a3aa8b..29d49c6cd 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/hilux.hpp @@ -5,7 +5,7 @@ class hilux1_civil_1_open_DZE: hilux1_civil_1_open { class Upgrades { ItemORP[] = {"hilux1_civil_1_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_2_covered; @@ -15,7 +15,7 @@ class hilux1_civil_2_covered_DZE: hilux1_civil_2_covered { class Upgrades { ItemORP[] = {"hilux1_civil_2_covered_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_3_open; @@ -25,7 +25,7 @@ class hilux1_civil_3_open_DZE: hilux1_civil_3_open { class Upgrades { ItemORP[] = {"hilux1_civil_3_open_DZE1",{},{{"ItemORP",1},{"PartEngine",2}}}; - ItemARM[] = {"Pickup_PK_INS_DZE",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -48,7 +48,7 @@ class hilux1_civil_1_open_DZE1: hilux1_civil_1_open_DZE { class Upgrades { ItemAVE[] = {"hilux1_civil_1_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_2_covered_DZE1: hilux1_civil_2_covered_DZE { @@ -69,7 +69,7 @@ class hilux1_civil_2_covered_DZE1: hilux1_civil_2_covered_DZE { class Upgrades { ItemAVE[] = {"hilux1_civil_2_covered_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_3_open_DZE1: hilux1_civil_3_open_DZE { @@ -90,7 +90,7 @@ class hilux1_civil_3_open_DZE1: hilux1_civil_3_open_DZE { class Upgrades { ItemAVE[] = {"hilux1_civil_3_open_DZE2",{},{{"ItemAVE",1},{"PartGeneric",4},{"ItemTankTrap",2}}}; - ItemARM[] = {"Pickup_PK_INS_DZE1",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE1",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -141,7 +141,7 @@ class hilux1_civil_1_open_DZE2: hilux1_civil_1_open_DZE1 { class Upgrades { ItemLRK[] = {"hilux1_civil_1_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_2_covered_DZE2: hilux1_civil_2_covered_DZE1 { @@ -190,7 +190,7 @@ class hilux1_civil_2_covered_DZE2: hilux1_civil_2_covered_DZE1 { class Upgrades { ItemLRK[] = {"hilux1_civil_2_covered_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_3_open_DZE2: hilux1_civil_3_open_DZE1 { @@ -239,7 +239,7 @@ class hilux1_civil_3_open_DZE2: hilux1_civil_3_open_DZE1 { class Upgrades { ItemLRK[] = {"hilux1_civil_3_open_DZE3",{},{{"ItemLRK",1},{"PartGeneric",2},{"ItemTent",1}}}; - ItemARM[] = {"Pickup_PK_INS_DZE2",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE2",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -251,7 +251,7 @@ class hilux1_civil_1_open_DZE3: hilux1_civil_1_open_DZE2 { class Upgrades { ItemTNK[] = {"hilux1_civil_1_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; - ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_2_covered_DZE3: hilux1_civil_2_covered_DZE2 { @@ -261,7 +261,7 @@ class hilux1_civil_2_covered_DZE3: hilux1_civil_2_covered_DZE2 { class Upgrades { ItemTNK[] = {"hilux1_civil_2_covered_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_3_open_DZE3: hilux1_civil_3_open_DZE2 { @@ -271,7 +271,7 @@ class hilux1_civil_3_open_DZE3: hilux1_civil_3_open_DZE2 { class Upgrades { ItemTNK[] = {"hilux1_civil_3_open_DZE4",{},{{"ItemTNK",1},{"PartFueltank",2}}}; - ItemARM[] = {"Pickup_PK_INS_DZE3",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE3",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; @@ -280,20 +280,20 @@ class hilux1_civil_1_open_DZE4: hilux1_civil_1_open_DZE3 { fuelCapacity = 210; // car 100 class Upgrades { - ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_GUE_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_2_covered_DZE4: hilux1_civil_2_covered_DZE3 { fuelCapacity = 210; // car 100 class Upgrades { - ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_TK_GUE_EP1_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; class hilux1_civil_3_open_DZE4: hilux1_civil_3_open_DZE3 { fuelCapacity = 210; // car 100 class Upgrades { - ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PK_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; + ItemARM[] = {"Pickup_PK_INS_DZE4",{{"PKM_DZ",1}},{{"ItemARM",1},{"PartGeneric",2}}}; }; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 203b83448..39b5a1b14 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -13,14 +13,9 @@ class CfgWeapons class ItemCore; class Rifle; class Pistol; - class PistolCore; class GrenadeLauncher; - class Pecheneg; - class Pecheneg_DZ: Pecheneg { - type = "1"; - }; - + /* Dummy weapons */ #include "Throw.hpp" @@ -30,7 +25,9 @@ class CfgWeapons #include "Weapon\Sniper\AS50.hpp" #include "Weapon\Sniper\M107.hpp" #include "Weapon\Sniper\KSVK.hpp" - + + + //each include is preceded by its required external references. /* RIFLES */ @@ -47,13 +44,16 @@ class CfgWeapons #include "Rifles\RPK.hpp" - class DMR; + class DMR : Rifle + { + class Single; + }; #include "Rifles\DMR.hpp" - + class FN_FAL; class FN_FAL_ANPVS4; #include "Rifles\FNFAL.hpp" - + class G36C : Rifle { class Single; @@ -84,10 +84,10 @@ class CfgWeapons class M249; #include "Rifles\M249.hpp" - + class BAF_L110A1_Aim; #include "Rifles\L110A1.hpp" - + class M240; class m240_scoped_EP1; #include "Rifles\M240.hpp" @@ -107,9 +107,7 @@ class CfgWeapons { class manual; }; - class PK_DZ: PK { - type = "1"; - }; + class Pecheneg; #include "Rifles\PKM.hpp" #include "Rifles\UK59.hpp" @@ -152,6 +150,8 @@ class CfgWeapons #include "Rifles\Remington870.hpp" #include "Rifles\Crossbow.hpp" + + /* PISTOLS */ class M9; @@ -173,14 +173,17 @@ class CfgWeapons class revolver_EP1; #include "Pistols\Revolver.hpp" - + + + + + /* MELEE */ class MeleeWeapon : Rifle { melee = true; - canDrop = true; - + distanceZoomMin = 50; distanceZoomMax = 50; fireLightDuration = 0; @@ -224,6 +227,9 @@ class CfgWeapons #include "Melee\MeleeSledgehammer.hpp" + + + /* TOOLS */ #include "Tools\Binocular.hpp" @@ -256,6 +262,9 @@ class CfgWeapons #include "Item\ItemKeys.hpp" + + + /* OTHER */ /*class ItemFlashlightEmpty : ItemCore diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp index 8b04ef1c5..83eccf70f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp @@ -1,22 +1,16 @@ class MeleeSledge: MeleeWeapon { scope = public; - melee= "true"; - autoreload=1; - magazineReloadTime=0; + model="\z\addons\dayz_epoch\models\sledge_weaponized"; picture="\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; // todo icon displayName=$STR_EQUIP_NAME_SledgeHammer; + descriptionShort=$STR_EQUIP_SLEDGE_DESC; + + magazines[]= {"Sledge_Swing"}; + droppeditem= "ItemSledge"; - magazines[]= - { - "Sledge_Swing" - }; - handAnim[]= - { - "OFP2_ManSkeleton", - "\dayz_weapons\anim\melee_hatchet_holding.rtm" - }; + class ItemActions { class Toolbelt @@ -37,5 +31,4 @@ class MeleeSledge: MeleeWeapon { libTextDesc=$STR_EQUIP_SLEDGE_DESC; }; - descriptionShort=$STR_EQUIP_SLEDGE_DESC; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp index 2a9323054..cbcc61b59 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/DMR.hpp @@ -7,7 +7,12 @@ class DMR_DZ : DMR magazines[] = {20Rnd_762x51_DMR}; - class Single; + class Single : Single + { + reloadTime = 0.6; + recoil = "recoil_single_primary_4outof10"; + recoilProne = "recoil_single_primary_prone_4outof10"; + }; visionMode[] = {"Normal"}; @@ -16,7 +21,9 @@ class DMR_DZ : DMR Attachment_Ghillie = "DMR_Gh_DZ"; }; }; + class DMR_SKN : DMR_DZ {}; + class DMR_Gh_DZ : DMR_DZ { model = "z\addons\dayz_communityweapons\dmr\dmr_ghillie.p3d"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/FNFAL.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/FNFAL.hpp index ad3ff8c6d..921a42175 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/FNFAL.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/FNFAL.hpp @@ -56,6 +56,7 @@ class FNFAL_ANPVS4_DZ : FN_FAL_ANPVS4 { modes[] = {Single}; }; + class FN_FAL_ANPVS4_DZE:FN_FAL_ANPVS4 { - visionMode[] = {"Normal", "NVG"}; + visionMode[] = {"Normal", "NVG"}; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp index c026b2928..1a59290e7 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp @@ -1,6 +1,3 @@ -class BAF_L110A1_Aim_DZE:BAF_L110A1_Aim { - type = "1"; -}; class L110A1_CCO_DZ : BAF_L110A1_Aim { model = "z\addons\dayz_communityweapons\l110a1\l110a1_cco.p3d"; @@ -62,4 +59,17 @@ class L110A1_DZ : L110A1_CCO_DZ }; class ItemActions {}; +}; + +class BAF_L110A1_Aim_DZE:BAF_L110A1_Aim { //Slightly different scope from L110A1_CCO_DZ, otherwise identical + type = "1"; + + class ItemActions + { + class RemoveCCO + { + text = $STR_DZ_ATT_CCO_REM; + script = "; ['Attachment_CCO',_id,'L110A1_DZ'] call player_removeAttachment"; + }; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp index f79605292..87e924091 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M240.hpp @@ -49,6 +49,7 @@ class M240_Holo_DZ : M240_CCO_DZ }; }; }; -class m240_scoped_EP1_DZE:m240_scoped_EP1 { - type = "1"; + +class m240_scoped_EP1_DZE:m240_scoped_EP1 { //has m145 scope + type = "1"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp index d5e80e567..b73328022 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp @@ -60,11 +60,21 @@ class M249_Holo_DZ : M249_CCO_DZ }; }; }; + class M249_EP1; -class M249_EP1_DZ:M249_EP1 { +class M249_EP1_DZ:M249_EP1 { //Iron sight with shorter stock (different from M249_DZ) type = "1"; + + class Attachments + { + Attachment_CCO = "M249_CCO_DZ"; + Attachment_Holo = "M249_Holo_DZ"; + }; + + class ItemActions {}; }; + class M249_m145_EP1; class M249_m145_EP1_DZE:M249_m145_EP1 { - type = "1"; + type = "1"; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp index 8a06489fd..c5fa93f07 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/PKM.hpp @@ -1,4 +1,4 @@ -class PKM_DZ : PK +class PKM_DZ : PK //Iron sight PKM { type = WeaponSlotPrimary; @@ -17,4 +17,8 @@ class PKM_DZ : PK { reloadTime = 0.08; }; +}; + +class Pecheneg_DZ: Pecheneg { //PKP with long range scope + type = "1"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp index 61b51cc6a..6d952c69a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp @@ -30,7 +30,7 @@ class ItemSledge: ItemCore // Epoch class */ }; }; - +/* //Vanilla sledge is using a different model class ItemSledgeHammer : ItemCore { scope = public; @@ -60,4 +60,5 @@ class ItemSledgeHammerBroken : ItemCore script = "spawn player_fixHatchet;"; }; }; -}; \ No newline at end of file +}; +*/ \ No newline at end of file diff --git a/SQF/dayz_code/NOTE.txt b/SQF/dayz_code/NOTE.txt index 0e2c4aa1f..b0602feb3 100644 --- a/SQF/dayz_code/NOTE.txt +++ b/SQF/dayz_code/NOTE.txt @@ -1,7 +1,5 @@ Convert traders + loot (if old system) to ItemBloodbag -REMOVE TOOL BREAKING, IT'S STUPID - trap_monitor.fsm is no more! //////////////////////////////////////// diff --git a/SQF/dayz_code/actions/object_dismantle.sqf b/SQF/dayz_code/actions/object_dismantle.sqf index b51535de9..8b47191f5 100644 --- a/SQF/dayz_code/actions/object_dismantle.sqf +++ b/SQF/dayz_code/actions/object_dismantle.sqf @@ -127,14 +127,16 @@ while {_isOk} do { }; }; - //Chances to damage tools - { - if ([(_x select 1)] call fn_chance) then { - player removeWeapon (_x select 0); - player addWeapon (_x select 2); - titleText ["Your tool has been damaged." , "PLAIN DOWN"]; - }; - }foreach _tools; + if (dayz_toolBreaking) then { + //Chances to damage tools + { + if ([(_x select 1)] call fn_chance) then { + player removeWeapon (_x select 0); + player addWeapon (_x select 2); + titleText ["Your tool has been damaged." , "PLAIN DOWN"]; + }; + }foreach _tools; + }; if(_counter == _limit) exitWith { //stop loop diff --git a/SQF/dayz_code/actions/player_breakin.sqf b/SQF/dayz_code/actions/player_breakin.sqf index 2dd8c00db..12934a26a 100644 --- a/SQF/dayz_code/actions/player_breakin.sqf +++ b/SQF/dayz_code/actions/player_breakin.sqf @@ -5,7 +5,7 @@ _pos = getPos _target; _isGate = (typeOf cursorTarget) in ["WoodenGate_2","WoodenGate_3","WoodenGate_4"]; _limit = 2 + round(random 3); -_hasSledgeHammer = "ItemSledgeHammer" in items player; +_hasSledgeHammer = "ItemSledge" in items player; _hasCrowbar = "ItemCrowbar" in items player; if (!_hasSledgeHammer) exitWith { @@ -25,7 +25,7 @@ _brokein = false; while {_isOk} do { //Check if we have the tools to start - _hasSledgeHammer = "ItemSledgeHammer" in items player; + _hasSledgeHammer = "ItemSledge" in items player; _hasCrowbar = "ItemCrowbar" in items player; if (!_hasSledgeHammer) exitWith { @@ -100,17 +100,20 @@ while {_isOk} do { }; }; - //Chances to damage tools - if ([0.02] call fn_chance) then { - player removeWeapon "ItemSledgeHammer"; - player addWeapon "ItemSledgeHammerBroken"; - titleText ["Your SledgeHammer handle has snapped." , "PLAIN DOWN"]; - }; + if (dayz_toolBreaking) then { + //Chances to damage tools + if ([0.02] call fn_chance) then { + player removeWeapon "ItemSledge"; + player addMagazine "ItemSledgeHandle"; + player addMagazine "ItemSledgeHead"; + titleText ["Your SledgeHammer handle has snapped." , "PLAIN DOWN"]; + }; - if ([0.04] call fn_chance) then { - player removeWeapon "ItemCrowbar"; - player addWeapon "ItemCrowbarBent"; - titleText ["Your crowbar has bent." , "PLAIN DOWN"]; + if ([0.04] call fn_chance) then { + player removeWeapon "ItemCrowbar"; + player addWeapon "ItemCrowbarBent"; + titleText ["Your crowbar has bent." , "PLAIN DOWN"]; + }; }; if(_counter == _limit) exitWith { diff --git a/SQF/dayz_code/actions/player_chopWood.sqf b/SQF/dayz_code/actions/player_chopWood.sqf index 9d9df6206..a75c76387 100644 --- a/SQF/dayz_code/actions/player_chopWood.sqf +++ b/SQF/dayz_code/actions/player_chopWood.sqf @@ -102,7 +102,7 @@ if (_woodCutting) then { if(_finished) then { _breaking = false; - if ([0.04] call fn_chance) then { + if (dayz_toolBreaking && {[0.04] call fn_chance}) then { _breaking = true; if ("MeleeHatchet" in weapons player) then { player removeWeapon "MeleeHatchet"; diff --git a/SQF/dayz_code/actions/player_mineStone.sqf b/SQF/dayz_code/actions/player_mineStone.sqf index c3c673465..e0f9da0b2 100644 --- a/SQF/dayz_code/actions/player_mineStone.sqf +++ b/SQF/dayz_code/actions/player_mineStone.sqf @@ -88,7 +88,7 @@ if (!isNull _findNearestRock) then { if(_finished) then { _breaking = false; - if ([0.04] call fn_chance) then { + if (dayz_toolBreaking && {[0.04] call fn_chance}) then { _breaking = true; if ("MeleePickaxe" in weapons player) then { player removeWeapon "MeleePickaxe"; diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index 3ee0f3655..28db08cce 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -129,9 +129,7 @@ while {_isOk} do { _counter = _counter + 1; // 10% chance to break a required tool each pass if((_isDestructable || _isRemovable) && !_isOwnerOfObj) then { - if((random 10) <= 1) then { - _brokenTool = true; - }; + if (dayz_toolBreaking && {[0.04] call fn_chance}) then {_brokenTool = true;}; }; }; if(_brokenTool) exitWith { diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index d5c3cb7e4..5be795b6d 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -5,6 +5,7 @@ dayz_knifeDulling = false; // Enable knife dulling. Knives need to be sharpened after so many uses. dayz_matchboxCount = false; // Enable match stick count. After five uses matches run out and must be replaced. +dayz_toolBreaking = false; //Sledgehammer, crowbar and pickaxe have a chance to break when used. dayz_waterBottleBreaking = false; // Water bottles have a chance to break when boiling and require duct tape to fix dayz_sellDistance_vehicle = 10; // Max distance players can sell land vehicles from at traders dayz_sellDistance_boat = 30; // Max distance players can sell boats from at traders diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index 104d45783..5adbc3678 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -104,6 +104,10 @@ class CfgWeight { weight=5.5; }; + class FN_FAL_ANPVS4_DZE + { + weight=5.5; + }; class glock17_EP1 { weight = 0.7; @@ -112,6 +116,10 @@ class CfgWeight { weight = 0.7; }; + class G17_FL_DZ + { + weight = 0.7; + }; class G36A_camo { weight = 3.6; @@ -276,6 +284,10 @@ class CfgWeight { weight = 3.8; }; + class M16A4_ACOG_DZ + { + weight = 3.8; + }; class M16A4 { weight = 3.8; @@ -634,6 +646,10 @@ class CfgWeight { weight = 2.7; }; + class AK74_Kobra_DZ + { + weight = 2.7; + }; class AKM_DZ { weight = 2.7; diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index e33342c99..802042f2d 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -643,20 +643,21 @@ dayz_inflame = { _hasTool = false; { if (_x in items player) exitWith { - _matches = getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "matches"); - _qtyRemaining = getText(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "qtyRemaining"); - - //diag_log format["%1[%2,%3]",_x,_matches,_qtyRemaining]; - - if (_matches == -1) then { - if ([getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "chance")] call fn_chance) then { + if (dayz_matchboxCount) then { + _matches = getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "matches"); + _qtyRemaining = getText(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "qtyRemaining"); + + //diag_log format["%1[%2,%3]",_x,_matches,_qtyRemaining]; + if (_matches == -1) then { + if ([getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "chance")] call fn_chance) then { + player removeWeapon _x; + player addWeapon _qtyRemaining; + }; + } else { + // remove a match player removeWeapon _x; player addWeapon _qtyRemaining; }; - } else { - // remove a match - player removeWeapon _x; - player addWeapon _qtyRemaining; }; _hasTool = true; }; @@ -705,20 +706,22 @@ dayz_inflame_other = { _hasTool = false; { if (_x in items player) exitWith { - _matches = getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "matches"); - _qtyRemaining = getText(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "qtyRemaining"); - - //diag_log format["%1[%2,%3]",_x,_matches,_qtyRemaining]; + if (dayz_matchboxCount) then { + _matches = getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "matches"); + _qtyRemaining = getText(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "qtyRemaining"); + + //diag_log format["%1[%2,%3]",_x,_matches,_qtyRemaining]; - if (_matches == -1) then { - if ([getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "chance")] call fn_chance) then { + if (_matches == -1) then { + if ([getNumber(configfile >> "cfgWeapons" >> _x >> "Ignators" >> "chance")] call fn_chance) then { + player removeWeapon _x; + player addWeapon _qtyRemaining; + }; + } else { + // remove a match player removeWeapon _x; player addWeapon _qtyRemaining; }; - } else { - // remove a match - player removeWeapon _x; - player addWeapon _qtyRemaining; }; _hasTool = true; }; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp index 7b3954d02..4e0c36ee9 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/BanditWeapons.hpp @@ -9,7 +9,7 @@ class Category_627 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class FNFAL_ANPVS4_DZ { + class FN_FAL_ANPVS4_DZE { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -29,7 +29,7 @@ class Category_627 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk48_DZ { + class Mk48_CCO_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp index c8f5c4581..fee53b67a 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyAssaultRifle.hpp @@ -59,22 +59,32 @@ class Category_485 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; + class SA58_RIS_DZ { + type = "trade_weapons"; + buy[] = {3,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; + }; class SA58_CCO_DZ { type = "trade_weapons"; - buy[] = {8,"ItemGoldBar"}; - sell[] = {4,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; - class SA58_DZ { + class Sa58V_CCO_EP1 { type = "trade_weapons"; - buy[] = {2,"ItemGoldBar"}; - sell[] = {1,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; class SA58_ACOG_DZ { + type = "trade_weapons"; + buy[] = {6,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; + class Sa58V_RCO_EP1 { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS74U_Kobra_DZ { + class AK74_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -171,22 +181,32 @@ class Category_615 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; + class SA58_RIS_DZ { + type = "trade_weapons"; + buy[] = {3,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; + }; class SA58_CCO_DZ { type = "trade_weapons"; - buy[] = {8,"ItemGoldBar"}; - sell[] = {4,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; - class SA58_DZ { + class Sa58V_CCO_EP1 { type = "trade_weapons"; - buy[] = {2,"ItemGoldBar"}; - sell[] = {1,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; class SA58_ACOG_DZ { + type = "trade_weapons"; + buy[] = {6,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; + class Sa58V_RCO_EP1 { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS74U_Kobra_DZ { + class AK74_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp index 246330608..2582bbf4e 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyLightMachineGun.hpp @@ -9,7 +9,7 @@ class Category_486 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk48_DZ { + class Mk48_CCO_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -31,7 +31,7 @@ class Category_616 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk48_DZ { + class Mk48_CCO_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp index 341dbeee5..34ed6238a 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyPistols.hpp @@ -4,7 +4,7 @@ class Category_489 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class G17_DZ { + class G17_FL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; @@ -46,7 +46,7 @@ class Category_617 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class G17_DZ { + class G17_FL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp index e334216db..99ea84cba 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlyShotgunsandSingleshot.hpp @@ -19,7 +19,7 @@ class Category_574 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_DZ { + class Remington870_FL_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -51,7 +51,7 @@ class Category_620 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_DZ { + class Remington870_FL_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp index 0c4adf46e..5c6d410b5 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/FriendlySniperRifle.hpp @@ -4,7 +4,7 @@ class Category_487 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3_DZ { + class M40A3_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -51,7 +51,7 @@ class Category_619 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3_DZ { + class M40A3_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp index 206323ff0..97d859a33 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/HeroWeapons.hpp @@ -9,7 +9,7 @@ class Category_477 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class FNFAL_ANPVS4_DZ { + class FN_FAL_ANPVS4_DZE { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -29,7 +29,7 @@ class Category_477 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk48_DZ { + class Mk48_CCO_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp index d2b791b59..e55eb3a7c 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralAssaultRifle.hpp @@ -59,22 +59,32 @@ class Category_602 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; + class SA58_RIS_DZ { + type = "trade_weapons"; + buy[] = {3,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; + }; class SA58_CCO_DZ { type = "trade_weapons"; - buy[] = {8,"ItemGoldBar"}; - sell[] = {4,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; - class SA58_DZ { + class Sa58V_CCO_EP1 { type = "trade_weapons"; - buy[] = {2,"ItemGoldBar"}; - sell[] = {1,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; class SA58_ACOG_DZ { + type = "trade_weapons"; + buy[] = {6,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; + class Sa58V_RCO_EP1 { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS74U_Kobra_DZ { + class AK74_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; @@ -171,22 +181,32 @@ class Category_637 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; + class SA58_RIS_DZ { + type = "trade_weapons"; + buy[] = {3,"ItemGoldBar"}; + sell[] = {1,"ItemGoldBar"}; + }; class SA58_CCO_DZ { type = "trade_weapons"; - buy[] = {8,"ItemGoldBar"}; - sell[] = {4,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; - class SA58_DZ { + class Sa58V_CCO_EP1 { type = "trade_weapons"; - buy[] = {2,"ItemGoldBar"}; - sell[] = {1,"ItemGoldBar"}; + buy[] = {4,"ItemGoldBar"}; + sell[] = {2,"ItemGoldBar"}; }; class SA58_ACOG_DZ { + type = "trade_weapons"; + buy[] = {6,"ItemGoldBar"}; + sell[] = {4,"ItemGoldBar"}; + }; + class Sa58V_RCO_EP1 { type = "trade_weapons"; buy[] = {8,"ItemGoldBar"}; sell[] = {4,"ItemGoldBar"}; }; - class AKS74U_Kobra_DZ { + class AK74_Kobra_DZ { type = "trade_weapons"; buy[] = {4,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp index dc1b1d897..cea103112 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralLightMachineGun.hpp @@ -9,7 +9,7 @@ class Category_603 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk48_DZ { + class Mk48_CCO_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; @@ -31,7 +31,7 @@ class Category_638 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {5,"ItemGoldBar"}; }; - class Mk48_DZ { + class Mk48_CCO_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar10oz"}; sell[] = {1,"ItemGoldBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp index 90a11f389..a31bf51f5 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralPistols.hpp @@ -4,7 +4,7 @@ class Category_606 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class G17_DZ { + class G17_FL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; @@ -46,7 +46,7 @@ class Category_674 { buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; }; - class G17_DZ { + class G17_FL_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar"}; sell[] = {5,"ItemSilverBar10oz"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp index 96415ce72..d05cb1df1 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralShotgunsandSingleshot.hpp @@ -19,7 +19,7 @@ class Category_607 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_DZ { + class Remington870_FL_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; @@ -51,7 +51,7 @@ class Category_641 { buy[] = {3,"ItemGoldBar"}; sell[] = {2,"ItemGoldBar"}; }; - class Remington870_DZ { + class Remington870_FL_DZ { type = "trade_weapons"; buy[] = {2,"ItemGoldBar"}; sell[] = {1,"ItemGoldBar"}; diff --git a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp index 18c1b62b0..0326e6fdb 100644 --- a/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp +++ b/SQF/dayz_epoch_b/CfgServerTrader/Category/NeutralSniperRifle.hpp @@ -4,7 +4,7 @@ class Category_605 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3_DZ { + class M40A3_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; @@ -51,7 +51,7 @@ class Category_640 { buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; }; - class M40A3_DZ { + class M40A3_Gh_DZ { type = "trade_weapons"; buy[] = {1,"ItemGoldBar10oz"}; sell[] = {6,"ItemGoldBar"}; diff --git a/Server Files/SQL/1.0.6_Updates.sql b/Server Files/SQL/1.0.6_Updates.sql index d4fd32a10..2453d295e 100644 --- a/Server Files/SQL/1.0.6_Updates.sql +++ b/Server Files/SQL/1.0.6_Updates.sql @@ -121,10 +121,10 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'AKS_74_U', 'AKS74U_DZ') UPDATE character_data SET Inventory = REPLACE(Inventory, 'AKS_74_U', 'AKS74U_DZ') WHERE INSTR(Inventory, 'AKS_74_U') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'AKS_74_U', 'AKS74U_DZ') WHERE INSTR(Inventory, 'AKS_74_U') > 0; -UPDATE `Traders_DATA` SET `item` = '["AKS74U_Kobra_DZ",1]' WHERE `item` = '["AKS_74_kobra",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'AKS_74_kobra', 'AKS74U_Kobra_DZ') WHERE INSTR(Backpack, 'AKS_74_kobra') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'AKS_74_kobra', 'AKS74U_Kobra_DZ') WHERE INSTR(Inventory, 'AKS_74_kobra') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'AKS_74_kobra', 'AKS74U_Kobra_DZ') WHERE INSTR(Inventory, 'AKS_74_kobra') > 0; +UPDATE `Traders_DATA` SET `item` = '["AK74_Kobra_DZ",1]' WHERE `item` = '["AKS_74_kobra",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'AKS_74_kobra', 'AK74_Kobra_DZ') WHERE INSTR(Backpack, 'AKS_74_kobra') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'AKS_74_kobra', 'AK74_Kobra_DZ') WHERE INSTR(Inventory, 'AKS_74_kobra') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'AKS_74_kobra', 'AK74_Kobra_DZ') WHERE INSTR(Inventory, 'AKS_74_kobra') > 0; UPDATE `Traders_DATA` SET `item` = '["Bizon_DZ",1]' WHERE `item` = '["bizon",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'bizon', 'Bizon_DZ') WHERE INSTR(Backpack, 'bizon') > 0; @@ -146,20 +146,20 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'DMR', 'DMR_DZ') WHERE IN UPDATE character_data SET Inventory = REPLACE(Inventory, 'DMR', 'DMR_DZ') WHERE INSTR(Inventory, 'DMR') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'DMR', 'DMR_DZ') WHERE INSTR(Inventory, 'DMR') > 0; -UPDATE `Traders_DATA` SET `item` = '["FNFAL_ANPVS4_DZ",1]' WHERE `item` = '["FN_FAL_ANPVS4",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'FN_FAL_ANPVS4', 'FNFAL_ANPVS4_DZ') WHERE INSTR(Backpack, 'FN_FAL_ANPVS4') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'FN_FAL_ANPVS4', 'FNFAL_ANPVS4_DZ') WHERE INSTR(Inventory, 'FN_FAL_ANPVS4') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'FN_FAL_ANPVS4', 'FNFAL_ANPVS4_DZ') WHERE INSTR(Inventory, 'FN_FAL_ANPVS4') > 0; +UPDATE `Traders_DATA` SET `item` = '["FN_FAL_ANPVS4_DZE",1]' WHERE `item` = '["FN_FAL_ANPVS4",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'FN_FAL_ANPVS4', 'FN_FAL_ANPVS4_DZE') WHERE INSTR(Backpack, 'FN_FAL_ANPVS4') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'FN_FAL_ANPVS4', 'FN_FAL_ANPVS4_DZE') WHERE INSTR(Inventory, 'FN_FAL_ANPVS4') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'FN_FAL_ANPVS4', 'FN_FAL_ANPVS4_DZE') WHERE INSTR(Inventory, 'FN_FAL_ANPVS4') > 0; UPDATE `Traders_DATA` SET `item` = '["FNFAL_DZ",1]' WHERE `item` = '["FN_FAL",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'FN_FAL', 'FNFAL_DZ') WHERE INSTR(Backpack, 'FN_FAL') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, 'FN_FAL', 'FNFAL_DZ') WHERE INSTR(Inventory, 'FN_FAL') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'FN_FAL', 'FNFAL_DZ') WHERE INSTR(Inventory, 'FN_FAL') > 0; -UPDATE `Traders_DATA` SET `item` = '["G17_DZ",1]' WHERE `item` = '["glock17_EP1",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'glock17_EP1', 'G17_DZ') WHERE INSTR(Backpack, 'glock17_EP1') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'glock17_EP1', 'G17_DZ') WHERE INSTR(Inventory, 'glock17_EP1') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'glock17_EP1', 'G17_DZ') WHERE INSTR(Inventory, 'glock17_EP1') > 0; +UPDATE `Traders_DATA` SET `item` = '["G17_FL_DZ",1]' WHERE `item` = '["glock17_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'glock17_EP1', 'G17_FL_DZ') WHERE INSTR(Backpack, 'glock17_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'glock17_EP1', 'G17_FL_DZ') WHERE INSTR(Inventory, 'glock17_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'glock17_EP1', 'G17_FL_DZ') WHERE INSTR(Inventory, 'glock17_EP1') > 0; UPDATE `Traders_DATA` SET `item` = '["G36A_Camo_DZ",1]' WHERE `item` = '["G36A_camo",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'G36A_camo', 'G36A_Camo_DZ') WHERE INSTR(Backpack, 'G36A_camo') > 0; @@ -176,6 +176,11 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'G36K_camo', 'G36K_Camo_D UPDATE character_data SET Inventory = REPLACE(Inventory, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Inventory, 'G36K_camo') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'G36K_camo', 'G36K_Camo_DZ') WHERE INSTR(Inventory, 'G36K_camo') > 0; +UPDATE `Traders_DATA` SET `item` = '["L110A1_CCO_DZ",1]' WHERE `item` = '["BAF_L110A1_Aim_DZE",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'BAF_L110A1_Aim_DZE', 'L110A1_CCO_DZ') WHERE INSTR(Backpack, 'BAF_L110A1_Aim_DZE') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'BAF_L110A1_Aim_DZE', 'L110A1_CCO_DZ') WHERE INSTR(Inventory, 'BAF_L110A1_Aim_DZE') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'BAF_L110A1_Aim_DZE', 'L110A1_CCO_DZ') WHERE INSTR(Inventory, 'BAF_L110A1_Aim_DZE') > 0; + UPDATE `Traders_DATA` SET `item` = '["L85_Holo_DZ",1]' WHERE `item` = '["BAF_L85A2_RIS_Holo",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Backpack, 'BAF_L85A2_RIS_Holo') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, 'BAF_L85A2_RIS_Holo', 'L85_Holo_DZ') WHERE INSTR(Inventory, 'BAF_L85A2_RIS_Holo') > 0; @@ -191,10 +196,10 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'M1014', 'M1014_DZ') WHER UPDATE character_data SET Inventory = REPLACE(Inventory, 'M1014', 'M1014_DZ') WHERE INSTR(Inventory, 'M1014') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'M1014', 'M1014_DZ') WHERE INSTR(Inventory, 'M1014') > 0; -UPDATE `Traders_DATA` SET `item` = '["M14_DZ",1]' WHERE `item` = '["M14_EP1",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'M14_EP1', 'M14_DZ') WHERE INSTR(Backpack, 'M14_EP1') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'M14_EP1', 'M14_DZ') WHERE INSTR(Inventory, 'M14_EP1') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'M14_EP1', 'M14_DZ') WHERE INSTR(Inventory, 'M14_EP1') > 0; +UPDATE `Traders_DATA` SET `item` = '["M14_CCO_DZ",1]' WHERE `item` = '["M14_EP1",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M14_EP1', 'M14_CCO_DZ') WHERE INSTR(Backpack, 'M14_EP1') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M14_EP1', 'M14_CCO_DZ') WHERE INSTR(Inventory, 'M14_EP1') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M14_EP1', 'M14_CCO_DZ') WHERE INSTR(Inventory, 'M14_EP1') > 0; UPDATE `Traders_DATA` SET `item` = '["M16A2_DZ",1]' WHERE `item` = '["M16A2",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A2', 'M16A2_DZ') WHERE INSTR(Backpack, 'M16A2') > 0; @@ -206,10 +211,10 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A2GL', 'M16A2_GL_DZ') UPDATE character_data SET Inventory = REPLACE(Inventory, 'M16A2GL', 'M16A2_GL_DZ') WHERE INSTR(Inventory, 'M16A2GL') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'M16A2GL', 'M16A2_GL_DZ') WHERE INSTR(Inventory, 'M16A2GL') > 0; -UPDATE `Traders_DATA` SET `item` = '["M16A4_DZ",1]' WHERE `item` = '["M16A4_ACG",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A4_ACG', 'M16A4_DZ') WHERE INSTR(Backpack, 'M16A4_ACG') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'M16A4_ACG', 'M16A4_DZ') WHERE INSTR(Inventory, 'M16A4_ACG') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'M16A4_ACG', 'M16A4_DZ') WHERE INSTR(Inventory, 'M16A4_ACG') > 0; +UPDATE `Traders_DATA` SET `item` = '["M16A4_ACOG_DZ",1]' WHERE `item` = '["M16A4_ACG",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M16A4_ACG', 'M16A4_ACOG_DZ') WHERE INSTR(Backpack, 'M16A4_ACG') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M16A4_ACG', 'M16A4_ACOG_DZ') WHERE INSTR(Inventory, 'M16A4_ACG') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M16A4_ACG', 'M16A4_ACOG_DZ') WHERE INSTR(Inventory, 'M16A4_ACG') > 0; UPDATE `Traders_DATA` SET `item` = '["M1911_DZ",1]' WHERE `item` = '["Colt1911",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'Colt1911', 'M1911_DZ') WHERE INSTR(Backpack, 'Colt1911') > 0; @@ -221,10 +226,10 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'M24', 'M24_DZ') WHERE IN UPDATE character_data SET Inventory = REPLACE(Inventory, 'M24', 'M24_DZ') WHERE INSTR(Inventory, 'M24') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'M24', 'M24_DZ') WHERE INSTR(Inventory, 'M24') > 0; -UPDATE `Traders_DATA` SET `item` = '["M40A3_DZ",1]' WHERE `item` = '["M40A3",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'M40A3', 'M40A3_DZ') WHERE INSTR(Backpack, 'M40A3') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'M40A3', 'M40A3_DZ') WHERE INSTR(Inventory, 'M40A3') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'M40A3', 'M40A3_DZ') WHERE INSTR(Inventory, 'M40A3') > 0; +UPDATE `Traders_DATA` SET `item` = '["M40A3_Gh_DZ",1]' WHERE `item` = '["M40A3",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'M40A3', 'M40A3_Gh_DZ') WHERE INSTR(Backpack, 'M40A3') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'M40A3', 'M40A3_Gh_DZ') WHERE INSTR(Inventory, 'M40A3') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'M40A3', 'M40A3_Gh_DZ') WHERE INSTR(Inventory, 'M40A3') > 0; UPDATE `Traders_DATA` SET `item` = '["M4A1_CCO_DZ",1]' WHERE `item` = '["M4A1_Aim",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'M4A1_Aim', 'M4A1_CCO_DZ') WHERE INSTR(Backpack, 'M4A1_Aim') > 0; @@ -256,10 +261,10 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'MakarovSD', 'Makarov_SD_ UPDATE character_data SET Inventory = REPLACE(Inventory, 'MakarovSD', 'Makarov_SD_DZ') WHERE INSTR(Inventory, 'MakarovSD') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'MakarovSD', 'Makarov_SD_DZ') WHERE INSTR(Inventory, 'MakarovSD') > 0; -UPDATE `Traders_DATA` SET `item` = '["Mk48_DZ",1]' WHERE `item` = '["Mk_48_DZ",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'Mk_48_DZ', 'Mk48_DZ') WHERE INSTR(Backpack, 'Mk_48_DZ') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'Mk_48_DZ', 'Mk48_DZ') WHERE INSTR(Inventory, 'Mk_48_DZ') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'Mk_48_DZ', 'Mk48_DZ') WHERE INSTR(Inventory, 'Mk_48_DZ') > 0; +UPDATE `Traders_DATA` SET `item` = '["Mk48_CCO_DZ",1]' WHERE `item` = '["Mk_48_DZ",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Mk_48_DZ', 'Mk48_CCO_DZ') WHERE INSTR(Backpack, 'Mk_48_DZ') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Mk_48_DZ', 'Mk48_CCO_DZ') WHERE INSTR(Inventory, 'Mk_48_DZ') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Mk_48_DZ', 'Mk48_CCO_DZ') WHERE INSTR(Inventory, 'Mk_48_DZ') > 0; UPDATE `Traders_DATA` SET `item` = '["MP5_DZ",1]' WHERE `item` = '["MP5A5",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'MP5A5', 'MP5_DZ') WHERE INSTR(Backpack, 'MP5A5') > 0; @@ -281,15 +286,15 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'UZI_EP1', 'PDW_DZ') WHER UPDATE character_data SET Inventory = REPLACE(Inventory, 'UZI_EP1', 'PDW_DZ') WHERE INSTR(Inventory, 'UZI_EP1') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'UZI_EP1', 'PDW_DZ') WHERE INSTR(Inventory, 'UZI_EP1') > 0; -UPDATE `Traders_DATA` SET `item` = '["PKM_DZ",1]' WHERE `item` = '["Pecheneg_DZ",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'Pecheneg_DZ', 'PKM_DZ') WHERE INSTR(Backpack, 'Pecheneg_DZ') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'Pecheneg_DZ', 'PKM_DZ') WHERE INSTR(Inventory, 'Pecheneg_DZ') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'Pecheneg_DZ', 'PKM_DZ') WHERE INSTR(Inventory, 'Pecheneg_DZ') > 0; +UPDATE `Traders_DATA` SET `item` = '["PKM_DZ",1]' WHERE `item` = '["PK_DZ",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'PK_DZ', 'PKM_DZ') WHERE INSTR(Backpack, 'PK_DZ') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'PK_DZ', 'PKM_DZ') WHERE INSTR(Inventory, 'PK_DZ') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'PK_DZ', 'PKM_DZ') WHERE INSTR(Inventory, 'PK_DZ') > 0; -UPDATE `Traders_DATA` SET `item` = '["Remington870_DZ",1]' WHERE `item` = '["Remington870_lamp",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'Remington870_lamp', 'Remington870_DZ') WHERE INSTR(Backpack, 'Remington870_lamp') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'Remington870_lamp', 'Remington870_DZ') WHERE INSTR(Inventory, 'Remington870_lamp') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'Remington870_lamp', 'Remington870_DZ') WHERE INSTR(Inventory, 'Remington870_lamp') > 0; +UPDATE `Traders_DATA` SET `item` = '["Remington870_FL_DZ",1]' WHERE `item` = '["Remington870_lamp",1]'; +UPDATE character_data SET Backpack = REPLACE(Backpack, 'Remington870_lamp', 'Remington870_FL_DZ') WHERE INSTR(Backpack, 'Remington870_lamp') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, 'Remington870_lamp', 'Remington870_FL_DZ') WHERE INSTR(Inventory, 'Remington870_lamp') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, 'Remington870_lamp', 'Remington870_FL_DZ') WHERE INSTR(Inventory, 'Remington870_lamp') > 0; UPDATE `Traders_DATA` SET `item` = '["Revolver_DZ",1]' WHERE `item` = '["revolver_EP1",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'revolver_EP1', 'Revolver_DZ') WHERE INSTR(Backpack, 'revolver_EP1') > 0; @@ -301,16 +306,6 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'RPK_74', 'RPK74_DZ') WHE UPDATE character_data SET Inventory = REPLACE(Inventory, 'RPK_74', 'RPK74_DZ') WHERE INSTR(Inventory, 'RPK_74') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'RPK_74', 'RPK74_DZ') WHERE INSTR(Inventory, 'RPK_74') > 0; -UPDATE `Traders_DATA` SET `item` = '["SA58_ACOG_DZ",1]' WHERE `item` = '["Sa58V_RCO_EP1",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58V_RCO_EP1', 'SA58_ACOG_DZ') WHERE INSTR(Backpack, 'Sa58V_RCO_EP1') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58V_RCO_EP1', 'SA58_ACOG_DZ') WHERE INSTR(Inventory, 'Sa58V_RCO_EP1') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'Sa58V_RCO_EP1', 'SA58_ACOG_DZ') WHERE INSTR(Inventory, 'Sa58V_RCO_EP1') > 0; - -UPDATE `Traders_DATA` SET `item` = '["SA58_CCO_DZ",1]' WHERE `item` = '["Sa58V_CCO_EP1",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58V_CCO_EP1', 'SA58_CCO_DZ') WHERE INSTR(Backpack, 'Sa58V_CCO_EP1') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58V_CCO_EP1', 'SA58_CCO_DZ') WHERE INSTR(Inventory, 'Sa58V_CCO_EP1') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'Sa58V_CCO_EP1', 'SA58_CCO_DZ') WHERE INSTR(Inventory, 'Sa58V_CCO_EP1') > 0; - UPDATE `Traders_DATA` SET `item` = '["SA58_DZ",1]' WHERE `item` = '["Sa58P_EP1",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'Sa58P_EP1', 'SA58_DZ') WHERE INSTR(Backpack, 'Sa58P_EP1') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, 'Sa58P_EP1', 'SA58_DZ') WHERE INSTR(Inventory, 'Sa58P_EP1') > 0; @@ -331,11 +326,6 @@ UPDATE character_data SET Backpack = REPLACE(Backpack, 'SVD_CAMO', 'SVD_Gh_DZ') UPDATE character_data SET Inventory = REPLACE(Inventory, 'SVD_CAMO', 'SVD_Gh_DZ') WHERE INSTR(Inventory, 'SVD_CAMO') > 0; UPDATE object_data SET Inventory = REPLACE(Inventory, 'SVD_CAMO', 'SVD_Gh_DZ') WHERE INSTR(Inventory, 'SVD_CAMO') > 0; -UPDATE `Traders_DATA` SET `item` = '["UK59_DZ",1]' WHERE `item` = '["PK_DZ",1]'; -UPDATE character_data SET Backpack = REPLACE(Backpack, 'PK_DZ', 'UK59_DZ') WHERE INSTR(Backpack, 'PK_DZ') > 0; -UPDATE character_data SET Inventory = REPLACE(Inventory, 'PK_DZ', 'UK59_DZ') WHERE INSTR(Inventory, 'PK_DZ') > 0; -UPDATE object_data SET Inventory = REPLACE(Inventory, 'PK_DZ', 'UK59_DZ') WHERE INSTR(Inventory, 'PK_DZ') > 0; - UPDATE `Traders_DATA` SET `item` = '["Winchester1866_DZ",1]' WHERE `item` = '["Winchester1866",1]'; UPDATE character_data SET Backpack = REPLACE(Backpack, 'Winchester1866', 'Winchester1866_DZ') WHERE INSTR(Backpack, 'Winchester1866') > 0; UPDATE character_data SET Inventory = REPLACE(Inventory, 'Winchester1866', 'Winchester1866_DZ') WHERE INSTR(Inventory, 'Winchester1866') > 0;