Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

0.3.7.047

Browse Source
This commit is contained in:
vbawol 2016-01-22 07:09:55 -06:00
parent 382f072d61
commit e6516315a3
6 changed files with 114 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Sources/epoch_config/Configs/CfgBaseBuilding.hpp
View File

@ -78,7 +78,7 @@ class CfgBaseBuilding {
}; };
class WoodLargeWall_EPOCH : Default{ class WoodLargeWall_EPOCH : Default{
upgradeBuilding[] = { upgradeBuilding[] = {
{ "WoodWall1_EPOCH", { { "PartPlankPack", 1 } } }, { "WoodWall1_EPOCH", { { "ItemPlywoodPack", 1 } } },
{ "WoodLargeWallCor_EPOCH", { { "ItemCorrugated", 1 } } } { "WoodLargeWallCor_EPOCH", { { "ItemCorrugated", 1 } } }
}; };
removeParts[] = { { "PartPlankPack", 2 } }; removeParts[] = { { "PartPlankPack", 2 } };
@ -96,10 +96,10 @@ class CfgBaseBuilding {
}; };
class WoodWall2_EPOCH : Default{ class WoodWall2_EPOCH : Default{
upgradeBuilding[] = { upgradeBuilding[] = {
{ "WoodWall3_EPOCH", { { "PartPlankPack", 1 } } }, { "WoodWall3_EPOCH", { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 1 } } },
{ "WoodLargeWallDoor_EPOCH", { { "ItemCorrugated", 1 }, { "PartPlankPack", 1 } } }, { "WoodLargeWallDoor_EPOCH", { { "ItemCorrugated", 1 }, { "PartPlankPack", 1 } } },
}; };
removeParts[] = { { "PartPlankPack", 2 } }; removeParts[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } };
}; };
class WoodLargeWallDoorway_EPOCH : Default{ class WoodLargeWallDoorway_EPOCH : Default{
upgradeBuilding[] = { { "WoodLargeWallDoor_EPOCH", { { "ItemCorrugated", 1 }, { "PartPlankPack", 1 } } } }; upgradeBuilding[] = { { "WoodLargeWallDoor_EPOCH", { { "ItemCorrugated", 1 }, { "PartPlankPack", 1 } } } };
@ -110,14 +110,14 @@ class CfgBaseBuilding {
{ "WoodWall4_EPOCH", { { "CircuitParts", 1 } } }, { "WoodWall4_EPOCH", { { "CircuitParts", 1 } } },
{ "WoodLargeWallDoorL_EPOCH", { { "ItemCorrugated", 1 }, { "CircuitParts", 1 } } }, { "WoodLargeWallDoorL_EPOCH", { { "ItemCorrugated", 1 }, { "CircuitParts", 1 } } },
}; };
removeParts[] = { { "PartPlankPack", 2 } }; removeParts[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } };
}; };
class WoodLargeWallDoor_EPOCH : Default{ class WoodLargeWallDoor_EPOCH : Default{
upgradeBuilding[] = { { "WoodLargeWallDoorL_EPOCH", { { "ItemCorrugated", 1 }, { "CircuitParts", 1 } } } }; upgradeBuilding[] = { { "WoodLargeWallDoorL_EPOCH", { { "ItemCorrugated", 1 }, { "CircuitParts", 1 } } } };
removeParts[] = { { "PartPlankPack", 2 }, { "ItemCorrugated", 1 } }; removeParts[] = { { "PartPlankPack", 2 }, { "ItemCorrugated", 1 } };
}; };
class WoodWall4_EPOCH : Default { class WoodWall4_EPOCH : Default {
removeParts[] = { { "PartPlankPack", 2 }, { "CircuitParts", 1 } }; removeParts[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 }, { "CircuitParts", 1 } };
}; };
class WoodLargeWallDoorL_EPOCH : Default class WoodLargeWallDoorL_EPOCH : Default
{ {
@ -134,8 +134,8 @@ class CfgBaseBuilding {
class WoodTower_EPOCH : Default class WoodTower_EPOCH : Default
{ {
removeParts[] = { { "PartPlankPack", 4 } }; removeParts[] = { { "PartPlankPack", 4 } };
upgradeBuildingPart[] = { { "PartPlankPack", 2 } }; upgradeBuildingPart[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } };
removeBuildingPart[] = { { "PartPlankPack", 1 } }; removeBuildingPart[] = { { "ItemPlywoodPack", 1 }, { "PartPlankPack", 2 } };
}; };
class WoodLadder_EPOCH : Default class WoodLadder_EPOCH : Default
{ {

2
Sources/epoch_config/Configs/CfgMagazines.hpp
View File

@ -135,8 +135,6 @@ class CfgMagazines
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_kilohemp_CA.paa"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_kilohemp_CA.paa";
type = 256; type = 256;
mass = 1; mass = 1;
}; };
class ItemSodaRbull : 1Rnd_Soda{ class ItemSodaRbull : 1Rnd_Soda{

17
Sources/epoch_config/Configs/CfgMagazines/Custom.hpp
View File

@ -1,9 +1,9 @@
class ItemHotwire : CA_Magazine { class ItemHotwire : CA_Magazine {
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_hotwire_ca.paa"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_hotwire_ca.paa";
displayName = "$STR_EPOCH_ItemHotwire_displayName"; // Vehicle Hotwire Kit displayName = "$STR_EPOCH_ItemHotwire_displayName"; // Hotwire Kit
scope = 2; scope = 2;
model = "\x\addons\a3_epoch_assets_1\models\hotwire.p3d"; model = "\x\addons\a3_epoch_assets_1\models\hotwire.p3d";
descriptionShort = "$STR_EPOCH_ItemHotwire_descriptionShort"; // "; // Used to unlock vehicles. descriptionShort = "$STR_EPOCH_ItemHotwire_descriptionShort"; // "; // Used to hack open door locks.
count = 1; count = 1;
mass = 2; mass = 2;
interactAction = 2; interactAction = 2;
@ -217,18 +217,9 @@ class ItemTinBar : CA_Magazine {
count = 1; count = 1;
mass = 1; mass = 1;
}; };
class ItemPlywood : CA_Magazine {
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_plywood_CA.paa";
displayName = "$STR_EPOCH_ItemPlywood_displayName"; // Plywood
scope = 2;
model = "\x\addons\a3_epoch_assets_1\models\plywood.p3d";
descriptionShort = "$STR_EPOCH_ItemPlywood_descriptionShort"; // "; // Plywood Sheets
count = 1;
mass = 1;
};
class ItemPlywoodPack : CA_Magazine { class ItemPlywoodPack : CA_Magazine {
picture = "\x\addons\a3_epoch_assets_1\pictures\equip_plywood_pack_CA.paa"; picture = "\x\addons\a3_epoch_assets_1\pictures\equip_plywood_pack_CA.paa";
displayName = "$STR_EPOCH_ItemPlywoodPack_displayName"; // Plywood Pack displayName = "$STR_EPOCH_ItemPlywoodPack_displayName"; // Plywood
scope = 2; scope = 2;
model = "\x\addons\a3_epoch_assets_1\models\plywood_pack.p3d"; model = "\x\addons\a3_epoch_assets_1\models\plywood_pack.p3d";
descriptionShort = "$STR_EPOCH_ItemPlywoodPack_descriptionShort"; // "; // Stack of Plywood Sheets descriptionShort = "$STR_EPOCH_ItemPlywoodPack_descriptionShort"; // "; // Stack of Plywood Sheets
@ -510,7 +501,7 @@ class Item_Kitbag_mcamo : CA_Magazine {
}; };
class Item_Kitbag_rgr : CA_Magazine { class Item_Kitbag_rgr : CA_Magazine {
picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa"; picture = "\x\addons\a3_epoch_assets\textures\backpack\gear_packedBag_ca.paa";
displayName = "$STR_A3_B_KITHBACK_RGR"; displayName = "$STR_A3_B_Kitback_rgr0";
scope = 2; scope = 2;
model = "\x\addons\a3_epoch_assets\models\PackedBag.p3d"; model = "\x\addons\a3_epoch_assets\models\PackedBag.p3d";
descriptionShort = "$STR_EPOCH_Item_Kitbag_rgr_descriptionShort"; // "; // Packed Backpack descriptionShort = "$STR_EPOCH_Item_Kitbag_rgr_descriptionShort"; // "; // Packed Backpack

3
Sources/epoch_config/Configs/CfgPricing/AutoGen.hpp
View File

@ -82,9 +82,6 @@ class ItemCopperBar {
class ItemTinBar { class ItemTinBar {
price = 1; price = 1;
}; };
class ItemPlywood {
price = 10;
};
class ItemPlywoodPack { class ItemPlywoodPack {
price = 100; price = 100;
}; };

41
Sources/epoch_config/Configs/cfgCrafting.hpp
View File

@ -192,16 +192,24 @@ class CfgCrafting
class EnergyPack : Item class EnergyPack : Item
{ {
usedIn[] = { "EnergyPackLg" }; usedIn[] = { "EnergyPackLg" };
nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0}}; nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0},{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
recipe[] = { { "CircuitParts", 1 }, { "clean_water_epoch", 1 } }; recipe[] = { { "CircuitParts", 1 }, { "ItemCopperBar", 1 }, { "clean_water_epoch", 1 } };
previewPosition[] = {0.8,1,0.29}; previewPosition[] = {0.8,1,0.29};
previewScale = 1.75; previewScale = 1.75;
previewVector = 2.8; previewVector = 2.8;
}; };
class EnergyPackLg : Item class EnergyPackLg : Item
{ {
nearby[] = {{"Fire", "", "fire", {1,{"ALL"}}, 3, 1, 1, 0}}; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
recipe[] = { { "EnergyPack", 3 }, { "CircuitParts", 1 } }; recipe[] = { { "EnergyPack", 3 }, { "ItemGoldBar", 1 }, { "CircuitParts", 1 } };
previewPosition[] = {0.8,1,0.29};
previewScale = 1.75;
previewVector = 2.8;
};
class ItemBattery : Item
{
nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
recipe[] = { { "EnergyPackLg", 3 }, { "CircuitParts", 1 } };
previewPosition[] = {0.8,1,0.29}; previewPosition[] = {0.8,1,0.29};
previewScale = 1.75; previewScale = 1.75;
previewVector = 2.8; previewVector = 2.8;
@ -234,6 +242,13 @@ class CfgCrafting
previewScale = 0.4; previewScale = 0.4;
previewVector = 1; previewVector = 1;
}; };
class JackKit : Part
{
usedIn[] = { "KitSpikeTrap" , "KitMetalTrap" };
previewPosition[] = {0.796267,1,0.322762};
previewScale = 0.9;
previewVector = 1.4;
};
class ItemKiloHemp : Part class ItemKiloHemp : Part
{ {
usedIn[] = { "ItemRope", "ItemBurlap" }; usedIn[] = { "ItemRope", "ItemBurlap" };
@ -278,7 +293,7 @@ class CfgCrafting
class WoodLog_EPOCH : Part class WoodLog_EPOCH : Part
{ {
usedIn[] = { "PartPlankPack", "ItemStick" }; usedIn[] = { "PartPlankPack", "ItemStick", "ItemPlywoodPack" };
previewPosition[] = {0.800064,1,0.25}; previewPosition[] = {0.800064,1,0.25};
previewScale = 0.3; previewScale = 0.3;
}; };
@ -675,6 +690,17 @@ class CfgCrafting
previewVector = 1; previewVector = 1;
craftTime = 2; craftTime = 2;
}; };
class ItemPlywoodPack : Item
{
usedIn[] = {};
recipe[] = {{"WoodLog_EPOCH",3}};
previewPosition[] = {0.797837,1,0.288258};
previewScale = 0.2;
previewVector = 1;
craftTime = 2;
};
class KitFirePlace : Kit class KitFirePlace : Kit
{ {
recipe[] = {{"ItemRock",2},{"ItemStick",1}}; recipe[] = {{"ItemRock",2},{"ItemStick",1}};
@ -686,9 +712,10 @@ class CfgCrafting
class KitSpikeTrap : Kit class KitSpikeTrap : Kit
{ {
recipe[] = {{"PartPlankPack",4},{"ItemStick",2}}; recipe[] = {{"PartPlankPack",4},{"ItemStick",1},{"JackKit",1}};
model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d";
nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
previewPosition[] = {0.797675,1,0.398882}; previewPosition[] = {0.797675,1,0.398882};
@ -697,7 +724,7 @@ class CfgCrafting
}; };
class KitMetalTrap : Kit class KitMetalTrap : Kit
{ {
recipe[] = {{"PartPlankPack",4}, {"ItemStick",2}, {"ItemScraps",2}}; recipe[] = {{"PartPlankPack",4},{"ItemStick",1},{"ItemScraps",2},{"JackKit",1}};
model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d";
nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}}; nearby[] = {{"Workbench", "", "workbench", {1,{"WorkBench_EPOCH"}}, 3, 1, 0, 1}};
previewPosition[] = {0.797675,1,0.398882}; previewPosition[] = {0.797675,1,0.398882};

12
Sources/epoch_language/stringtable.xml
View File

@ -25,8 +25,8 @@
<Spanish>Server restart in %1 minutes.</Spanish> <Spanish>Server restart in %1 minutes.</Spanish>
</Key> </Key>
<Key ID="str_epoch_ItemHotwire_displayName"> <Key ID="str_epoch_ItemHotwire_displayName">
<Original>Vehicle Hotwire Kit</Original> <Original>Hotwire Kit</Original>
<English>Vehicle Hotwire Kit</English> <English>Hotwire Kit</English>
<German>Vehicle Hotwire Kit</German> <German>Vehicle Hotwire Kit</German>
<Czech>Vehicle Hotwire Kit</Czech> <Czech>Vehicle Hotwire Kit</Czech>
<French>Vehicle Hotwire Kit</French> <French>Vehicle Hotwire Kit</French>
@ -37,8 +37,8 @@
<Spanish>Vehicle Hotwire Kit</Spanish> <Spanish>Vehicle Hotwire Kit</Spanish>
</Key> </Key>
<Key ID="str_epoch_ItemHotwire_descriptionShort"> <Key ID="str_epoch_ItemHotwire_descriptionShort">
<Original>Used to unlock vehicles.</Original> <Original>Used to hack open door locks.</Original>
<English>Used to unlock vehicles.</English> <English>Used to hack open door locks.</English>
<German>Used to unlock vehicles.</German> <German>Used to unlock vehicles.</German>
<Czech>Used to unlock vehicles.</Czech> <Czech>Used to unlock vehicles.</Czech>
<French>Used to unlock vehicles.</French> <French>Used to unlock vehicles.</French>
@ -541,8 +541,8 @@
<Spanish>Plywood Sheets</Spanish> <Spanish>Plywood Sheets</Spanish>
</Key> </Key>
<Key ID="str_epoch_ItemPlywoodPack_displayName"> <Key ID="str_epoch_ItemPlywoodPack_displayName">
<Original>Plywood Pack</Original> <Original>Plywood</Original>
<English>Plywood Pack</English> <English>Plywood</English>
<German>Plywood Pack</German> <German>Plywood Pack</German>
<Czech>Plywood Pack</Czech> <Czech>Plywood Pack</Czech>
<French>Plywood Pack</French> <French>Plywood Pack</French>