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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
facoptere
2013-11-18 20:40:39 +01:00
parent 2136bf0c92 62851cf5f9
commit 61fe1b6ff5
7 changed files with 111 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp
View File

@@ -693,7 +693,12 @@ class CfgBuildingLoot {
{"ItemSandbag","magazine"}, {"ItemSandbag","magazine"},
{"Sa58P_EP1","weapon"}, {"Sa58P_EP1","weapon"},
{"Sa58V_EP1","weapon"}, {"Sa58V_EP1","weapon"},
{"BAF_L85A2_RIS_Holo","weapon"} {"BAF_L85A2_RIS_Holo","weapon"},
{"Saiga12K","weapon" },
{"Bizon","weapon" },
{"M8_SAW","weapon" },
{"MG36","weapon" },
{"RPK_74","weapon" },
}; };
itemChance[] = { itemChance[] = {
0.01, 0.01,
@@ -731,7 +736,12 @@ class CfgBuildingLoot {
0.02, 0.02,
0.01, 0.01,
0.02, 0.02,
0.01 0.01,
0.02, //saiga
0.02, //bizon
0.01, //m8_saw
0.01, //mg36
0.01 //rpk_74
}; };
itemTypeSmall[] = { itemTypeSmall[] = {
{ "M9","weapon" }, { "M9","weapon" },
@@ -808,7 +818,9 @@ class CfgBuildingLoot {
{"Sa58V_EP1","weapon"}, {"Sa58V_EP1","weapon"},
{"BAF_L85A2_RIS_Holo","weapon"}, {"BAF_L85A2_RIS_Holo","weapon"},
{"ItemFuelBarrel","magazine"}, {"ItemFuelBarrel","magazine"},
{"ItemFuelPump","magazine"} {"ItemFuelPump","magazine"},
{"RPK_74","weapon"},
{"Saiga12K","weapon"}
}; };
itemChance[] = { itemChance[] = {
0.01, 0.01,
@@ -848,6 +860,8 @@ class CfgBuildingLoot {
0.01, 0.01,
0.01, 0.01,
0.01, 0.01,
0.01,
0.01,
0.01 0.01
}; };
itemTypeSmall[] = { itemTypeSmall[] = {
@@ -934,7 +948,11 @@ class CfgBuildingLoot {
{"100Rnd_762x54_PK","magazine"}, {"100Rnd_762x54_PK","magazine"},
{ "militaryclothes","single" }, { "militaryclothes","single" },
{"NVGoggles","weapon"}, {"NVGoggles","weapon"},
{ "militaryammo","single" } { "militaryammo","single" },
{"M60A4_EP1_DZE","weapon" },
{"m240_scoped_EP1_DZE","weapon" },
{"M249_m145_EP1_DZE","weapon" },
{"MG36_camo","weapon" },
}; };
itemChance[] = { itemChance[] = {
0.01, 0.01,
@@ -982,7 +1000,11 @@ class CfgBuildingLoot {
0.02, 0.02,
0.01, 0.01,
0.01, 0.01,
0.03 0.03,
0.01, //m60
0.01, //m240_scoped
0.01, //m249 scoped
0.01 //mg36 camo
}; };
itemTypeSmall[] = { itemTypeSmall[] = {
{ "M9SD","weapon" }, { "M9SD","weapon" },
@@ -1004,7 +1026,8 @@ class CfgBuildingLoot {
{"29Rnd_30mm_AGS30","magazine"}, {"29Rnd_30mm_AGS30","magazine"},
{"50Rnd_127x107_DSHKM","magazine"}, {"50Rnd_127x107_DSHKM","magazine"},
{"48Rnd_40mm_MK19","magazine"}, {"48Rnd_40mm_MK19","magazine"},
{"100Rnd_127x99_M2","magazine"} {"100Rnd_127x99_M2","magazine"},
{"100Rnd_556x45_BetaCMag","magazine" }
}; };
itemChanceSmall[] = { itemChanceSmall[] = {
0.04, 0.04,
@@ -1026,6 +1049,7 @@ class CfgBuildingLoot {
0.02, 0.02,
0.03, 0.03,
0.03, 0.03,
0.02,
0.02 0.02
}; };
}; };
@@ -2016,6 +2040,8 @@ class CfgBuildingLoot {
{"WeaponHolder_ItemMachete", "object"}, {"WeaponHolder_ItemMachete", "object"},
{ "SCAR_H_LNG_Sniper_SD","weapon" }, { "SCAR_H_LNG_Sniper_SD","weapon" },
{"2000Rnd_762x51_M134","magazine"}, {"2000Rnd_762x51_M134","magazine"},
{"KSVK","weapon" },
{"m240_scoped_EP1_DZE","weapon" }
}; };
itemChance[] = { itemChance[] = {
0.03, 0.03,
@@ -2070,7 +2096,9 @@ class CfgBuildingLoot {
0.05, 0.05,
0.02, 0.02,
0.01, 0.01,
0.01 0.01,
0.01, //ksvk
0.01 //m240 scoped
}; };
}; };
class Land_House_C_1_EP1: Residential class Land_House_C_1_EP1: Residential

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

@@ -84,4 +84,7 @@ class CfgWeapons {
// #include "CfgWeapons\Weapon\Sniper\DMR_DZ2.hpp" // #include "CfgWeapons\Weapon\Sniper\DMR_DZ2.hpp"
// #include "CfgWeapons\Weapon\Sniper\DMR_DZ3.hpp" // #include "CfgWeapons\Weapon\Sniper\DMR_DZ3.hpp"
#include "CfgWeapons\Weapon\Pistol\MakerovSD.hpp" #include "CfgWeapons\Weapon\Pistol\MakerovSD.hpp"
#include "CfgWeapons\Weapon\LMG\m240_scoped.hpp"
#include "CfgWeapons\Weapon\LMG\m249_scoped.hpp"
#include "CfgWeapons\Weapon\LMG\M60A4.hpp"
}; };

4
SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp Normal file
View File

@@ -0,0 +1,4 @@
class M60A4_EP1;
class M60A4_EP1_DZE : M60A4_EP1 {
type = "1";
};

4
SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m240_scoped.hpp Normal file
View File

@@ -0,0 +1,4 @@
class m240_scoped_EP1;
class m240_scoped_EP1_DZE:m240_scoped_EP1 {
type = "1";
};

4
SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m249_scoped.hpp Normal file
View File

@@ -0,0 +1,4 @@
class M249_m145_EP1;
class M249_m145_EP1_DZE:M249_m145_EP1 {
type = "1";
};

42
SQF/dayz_epoch_b/stringtable.xml
View File

@@ -2528,7 +2528,7 @@
<German>Keymakers kit</German> <German>Keymakers kit</German>
<Russian>Keymakers kit</Russian> <Russian>Keymakers kit</Russian>
<Spanish>Keymakers kit</Spanish> <Spanish>Keymakers kit</Spanish>
<Dutch>Keymakers kit</Dutch> <Dutch>Sleutelmakers set</Dutch>
<French>Keymakers kit</French> <French>Keymakers kit</French>
<Czech>Keymakers kit</Czech> <Czech>Keymakers kit</Czech>
</Key> </Key>
@@ -2538,7 +2538,7 @@
<German>Kit including the tools required to smelt, mold and shape keys.</German> <German>Kit including the tools required to smelt, mold and shape keys.</German>
<Russian>Kit including the tools required to smelt, mold and shape keys.</Russian> <Russian>Kit including the tools required to smelt, mold and shape keys.</Russian>
<Spanish>Kit including the tools required to smelt, mold and shape keys.</Spanish> <Spanish>Kit including the tools required to smelt, mold and shape keys.</Spanish>
<Dutch>Kit including the tools required to smelt, mold and shape keys.</Dutch> <Dutch>Met deze sleutelmakers set kun je indien je een vuur en tin hebt je sleutels kopieren.</Dutch>
<French>Kit including the tools required to smelt, mold and shape keys.</French> <French>Kit including the tools required to smelt, mold and shape keys.</French>
<Czech>Kit including the tools required to smelt, mold and shape keys.</Czech> <Czech>Kit including the tools required to smelt, mold and shape keys.</Czech>
</Key> </Key>
@@ -2548,7 +2548,7 @@
<German>Vorschlaghammer</German> <German>Vorschlaghammer</German>
<Russian>кувалда</Russian> <Russian>кувалда</Russian>
<Spanish>Almádena</Spanish> <Spanish>Almádena</Spanish>
<Dutch>Beukhamer</Dutch> <Dutch>Voorhamer</Dutch>
<French>Frappe-Devant</French> <French>Frappe-Devant</French>
<Czech>Perlík</Czech> <Czech>Perlík</Czech>
</Key> </Key>
@@ -2558,7 +2558,7 @@
<German>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</German> <German>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</German>
<Russian>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Russian> <Russian>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Russian>
<Spanish>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Spanish> <Spanish>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Spanish>
<Dutch>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Dutch> <Dutch>Een grote voorhamer met stalen kop. Handig voor sloop en bouw werkzaamheden.</Dutch>
<French>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</French> <French>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</French>
<Czech>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Czech> <Czech>A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers.</Czech>
</Key> </Key>
@@ -2568,7 +2568,7 @@
<German>Angelrute</German> <German>Angelrute</German>
<Russian>удочка</Russian> <Russian>удочка</Russian>
<Spanish>Caña de Pesca</Spanish> <Spanish>Caña de Pesca</Spanish>
<Dutch>Hengelroede</Dutch> <Dutch>Vishengel</Dutch>
<French>Canne à Pêche</French> <French>Canne à Pêche</French>
<Czech>Rybářský Prut</Czech> <Czech>Rybářský Prut</Czech>
</Key> </Key>
@@ -2578,7 +2578,7 @@
<German>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</German> <German>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</German>
<Russian>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Russian> <Russian>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Russian>
<Spanish>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Spanish> <Spanish>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Spanish>
<Dutch>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Dutch> <Dutch>Vishengel: Dit carbonnen hengeltje is al oud, maar werkt nog prima!</Dutch>
<French>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</French> <French>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</French>
<Czech>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Czech> <Czech>Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.</Czech>
</Key> </Key>
@@ -2608,9 +2608,9 @@
<German>Feldspaten</German> <German>Feldspaten</German>
<Russian>саперная лопатка</Russian> <Russian>саперная лопатка</Russian>
<Spanish>Pala Afianzar</Spanish> <Spanish>Pala Afianzar</Spanish>
<Dutch></Dutch> <Dutch>Opklapbare schep/spade.</Dutch>
<French>Outil de Tranchée</French> <French>Outil de Tranchée</French>
<Czech></Czech> <Czech>Etool</Czech>
</Key> </Key>
</Package> </Package>
<Package name="dayz_epoch"> <Package name="dayz_epoch">
@@ -5557,22 +5557,22 @@
<Key ID="STR_EPOCH_PLAYER_295"> <Key ID="STR_EPOCH_PLAYER_295">
<Original>Remove from Toolbelt.</Original> <Original>Remove from Toolbelt.</Original>
<English>Remove from Toolbelt.</English> <English>Remove from Toolbelt.</English>
<German></German> <German>Remove from Toolbelt.</German>
<Russian></Russian> <Russian>Remove from Toolbelt.</Russian>
<Spanish></Spanish> <Spanish>Remove from Toolbelt.</Spanish>
<Dutch></Dutch> <Dutch>Verwijder van gereedschapsgordel</Dutch>
<French></French> <French>Remove from Toolbelt.</French>
<Czech></Czech> <Czech>Remove from Toolbelt.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_296"> <Key ID="STR_EPOCH_PLAYER_296">
<Original>Add to Toolbelt.</Original> <Original>Add to Toolbelt.</Original>
<English>Add to Toolbelt.</English> <English>Add to Toolbelt.</English>
<German></German> <German>Add to Toolbelt.</German>
<Russian></Russian> <Russian>Add to Toolbelt.</Russian>
<Spanish></Spanish> <Spanish>Add to Toolbelt.</Spanish>
<Dutch></Dutch> <Dutch>Voeg toe aan gereedschapsgordel</Dutch>
<French></French> <French>Add to Toolbelt.</French>
<Czech></Czech> <Czech>Add to Toolbelt.</Czech>
</Key> </Key>
<Key ID="STR_EPOCH_PLAYER_297"> <Key ID="STR_EPOCH_PLAYER_297">
<Original>Cast Fishing Pole</Original> <Original>Cast Fishing Pole</Original>
@@ -5580,7 +5580,7 @@
<German>Cast Fishing Pole</German> <German>Cast Fishing Pole</German>
<Russian>Cast Fishing Pole</Russian> <Russian>Cast Fishing Pole</Russian>
<Spanish>Cast Fishing Pole</Spanish> <Spanish>Cast Fishing Pole</Spanish>
<Dutch>Cast Fishing Pole</Dutch> <Dutch>Werp vislijn uit</Dutch>
<French>Cast Fishing Pole</French> <French>Cast Fishing Pole</French>
<Czech>Cast Fishing Pole</Czech> <Czech>Cast Fishing Pole</Czech>
</Key> </Key>

39
Server Files/mysql/add_new_weapons.sql Normal file
View File

@@ -0,0 +1,39 @@
-- ----------------------------
-- This should be done
-- ----------------------------
INSERT INTO `trader_items` VALUES(771, 'KSVK', 3, 'Rifle Sniper', 'trade_weapons');
INSERT INTO `trader_items` VALUES(772, '5Rnd_127x108_KSVK', 1, 'Ammo Rifle Sniper', 'trade_items');
INSERT INTO `trader_items` VALUES(773, 'Saiga12K', 3, 'Shotgun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(774, '8Rnd_B_Saiga12_74Slug', 1, 'Ammo Shotgun', 'trade_items');
INSERT INTO `trader_items` VALUES(775, '8Rnd_B_Saiga12_74Pellets', 1, 'Ammo Shotgun', 'trade_items');
INSERT INTO `trader_items` VALUES(776, 'bizon', 3, 'Sub Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(777, '64Rnd_9x19_Bizon', 1, 'Ammo SMG', 'trade_items');
INSERT INTO `trader_items` VALUES(778, 'M8_SAW', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(779, 'MG36', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(780, 'RPK_74', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(781, 'M60A4_EP1_DZE', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(782, 'm240_scoped_EP1_DZE', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(783, 'M249_m145_EP1', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(784, 'MG36_camo', 3, 'Machine Gun', 'trade_weapons');
INSERT INTO `trader_items` VALUES(785, '100Rnd_556x45_BetaCMag', 1, 'Ammo - Light Machine Gun', 'trade_items');
INSERT INTO `trader_items` VALUES(786, '75Rnd_545x39_RPK', 1, 'Ammo - Light Machine Gun', 'trade_items');
INSERT INTO `trader_items` VALUES(787, '100Rnd_556x45', 1, 'Ammo - Light Machine Gun', 'trade_items');
-- -------------------------------------------------------------------------------------------------------------
-- This needs flushed out more, as most is on black market (bizon, saiga should be on other vendors?)
-- -------------------------------------------------------------------------------------------------------------
INSERT INTO `Traders_DATA` VALUES(7370, '["M8_SAW",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7371, '["MG36",3]', 8, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7372, '["RPK_74",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7373, '["M60A4_EP1_DZE",3]', 5, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7374, '["m240_scoped_EP1_DZE",3]', 5, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7375, '["M249_m145_EP1_DZE",3]', 5, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7376, '["MG36_camo",3]', 8, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7377, '["100Rnd_556x45_BetaCMag",1]', 10, '[3,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(7378, '["100Rnd_556x45",1]', 10, '[3,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(7379, '["75Rnd_545x39_RPK",1]', 10, '[3,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(7380, '["KSVK",3]', 10, '[3,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 526, 'trade_weapons');
INSERT INTO `Traders_DATA` VALUES(7381, '["64Rnd_9x19_Bizon",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(7382, '["5Rnd_127x108_KSVK",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 527, 'trade_items');
INSERT INTO `Traders_DATA` VALUES(7380, '["bizon",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 526, 'trade_weapons');