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

Use 1.8.7 fishing

Browse Source 
The fishing models, pictures, etc. in 1.8.7 are identical to the ones in
dayz_epoch, so we should use them instead of having duplicate classes.
This commit is contained in:
ebaydayz
2016-03-10 22:30:19 -05:00
parent 6a2b135ac9
commit 09b656abc3
23 changed files with 336 additions and 1087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SQF/dayz_code/Configs/CfgMagazines/CfgMagazines.hpp
View File

@@ -39,8 +39,8 @@ class CfgMagazines
//EPOCH ADDITIONS
#include "VehicleAmmo.hpp"
// Gems
#include "DZE\Gems.hpp"
#include "DZE\Ores.hpp"
@@ -56,26 +56,14 @@ class CfgMagazines
#include "DZE\Currency\AluminumBar.hpp"
#include "DZE\Currency\TinBar.hpp"
// Waterbottle
//#include "ItemWaterbottle.hpp" //Moved to WaterBottle.hpp in consumables and items folders
#include "DZE\ItemWaterbottle.hpp"
//#include "MeleeSwing.hpp" //MOVED TO \MAGAZINES
#include "Planting.hpp"
// Building Stuff
#include "DZE\ModularBuilding.hpp"
#include "DZE\Misc.hpp"
//#include "Parts.hpp" //MOVED TO VehicleParts.hpp
//#include "Skins.hpp"//MOVED TO CLOTHING
// Food
//#include "Food.hpp"
// Consumables
#include "DZE\Food.hpp"
// EPOCH SODA
//#include "ItemSoda.hpp" //Moved to Consumables
#include "DZE\ItemSoda.hpp"
};

9
SQF/dayz_code/Configs/CfgMagazines/Clothing/Clothing.hpp
View File

@@ -21,13 +21,6 @@ class SkinBase : CA_Magazine
text = "Tear Clothes";
script = "spawn player_tearClothes;";
};
};
/*
class ItemActions {
class Use {
text = $STR_EPOCH_PLAYER_268;
script = "spawn player_wearClothes;";
};
class Crafting {
text = $STR_EPOCH_PLAYER_269b;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
@@ -45,7 +38,7 @@ class SkinBase : CA_Magazine
input[] = {{"SkinBase",1},{"ItemTrashToiletpaper",1}};
};
};
*/
weight = 1;
};
#include "Ghillie.hpp"

3
SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp
View File

@@ -9,7 +9,7 @@ class ItemWaterBottle : FoodDrink
Nutrition[] = {0,0,1000,0};
infectionChance = 0;
infectionChance = 0.3;
consumeOutput = "ItemWaterBottleUnfilled";
@@ -27,6 +27,7 @@ class ItemWaterBottle : FoodDrink
script = "spawn player_emptyContainer";
};
};
wateroz = 10; //Custom Epoch value
};
class ItemWaterBottleInfected : ItemWaterBottle

95
SQF/dayz_code/Configs/CfgMagazines/DELETE_ME_MeleeSwing.hpp
View File

@@ -1,95 +0,0 @@
class Melee_Swing : CA_Magazine {
// scopeWeapon = protected;
// scopeMagazine = protected;
// magazineType = WeaponNoSlot;
type = VSoft;
flash = "";
flashSize = 0;
initSpeed = 100;
maxLeadSpeed = 15; //20
dexterity = 2; //20
picture = "\dayz_weapons\textures\equip_shells_ca.paa";
displayName = "crt";
displayNameMagazine = "crt";
shortNameMagazine = "crt";
optics = false;
distanceZoomMin = 0;
distanceZoomMax = 0;
reloadTime = 0.1;
magazineReloadTime = 0.01;
drySound[] = {"", 0, 1};
reloadMagazineSound[] = {"", 0, 1};
modes[] = {"Single"};
sound[] = {"Weapons\grenade_launch", 0.0031623, 1};
reloadSound[] = {"", 0.0003162, 1};
showEmpty = 0;
autoReload = true;
count = 100000;
canLock = LockNo;
//
burst = 1;
multiplier = 1;
ffMagnitude = 0.1;
ffFrequency = 1;
ffCount = 1;
recoil = "Empty";
dispersion = 0.2;
class HitEffects {
hit_blood = "ImpactBlood";
hit_concrete = "ImpactConcrete";
hit_foliage = "ImpactLeaves";
hit_foliage_green = "ImpactLeavesGreen";
hit_glass = "ImpactGlass";
hit_glass_thin = "ImpactGlassThin";
hit_metal = "ImpactMetal";
hit_plaster = "ImpactPlaster";
hit_rubber = "ImpactRubber";
hit_wood = "ImpactWood";
};
};
class Machete_Swing : Melee_Swing {
displayName = Machete;
displayNameMagazine = Machete;
shortNameMagazine = Machete;
ammo = "Machete_Swing_Ammo";
};
class crowbar_swing : Melee_Swing {
displayName = Crowbar;
displayNameMagazine = Crowbar;
shortNameMagazine = Crowbar;
ammo = "Crowbar_Swing_Ammo";
};
class Fishing_Swing : Melee_Swing {
displayName = Fishing;
displayNameMagazine = Fishing;
shortNameMagazine = Fishing;
ammo = "Fishing_Swing_Ammo";
};
class Hatchet_Swing : Melee_Swing {
displayName = Hatchet;
displayNameMagazine = Hatchet;
shortNameMagazine = Hatchet;
ammo = "Hatchet_Swing_Ammo";
};
/*
class Bat_Swing : Melee_Swing {
displayName = BaseBallBat;
displayNameMagazine = BaseBallBat;
shortNameMagazine = BaseBallBat;
ammo = Bat_Swing_Ammo;
};
class BatBarbed_Swing : Melee_Swing {
displayName = BaseBallBatBarbed;
displayNameMagazine = BaseBallBatBarbed;
shortNameMagazine = BaseBallBatBarbed;
ammo = BatBarbed_Swing_Ammo;
};
class BatNails_Swing : Melee_Swing {
displayName = BaseBallBatNails;
displayNameMagazine = BaseBallBatNails;
shortNameMagazine = BaseBallBatNails;
ammo = BatNailed_Swing_Ammo;
};
*/

48
SQF/dayz_code/Configs/CfgMagazines/DZE/Food.hpp
View File

@@ -1,51 +1,3 @@
class ItemTrout : FoodEdible {
scope = public;
displayName = "Rainbow Trout";
descriptionShort = "Rainbow Trout: A small fish that can be fairly easy to catch.";
model = "\z\addons\dayz_epoch\models\trout.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_rainbowtrout_CA.paa";
bloodRegen = 400;
};
class ItemSeaBass : FoodEdible {
scope = public;
displayName = "Sea Bass";
descriptionShort = "Sea Bass: A medium sized fish that is fairly rare.";
model = "\z\addons\dayz_epoch\models\seabass.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_seabass_CA.paa";
bloodRegen = 800;
};
class ItemTuna : FoodEdible {
scope = public;
displayName = "Blue Fin Tuna";
descriptionShort = "Blue Fin Tuna: A very large and hard to catch fish. Sushi anyone?";
model = "\z\addons\dayz_epoch\models\tuna.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_tuna_CA.paa";
bloodRegen = 2500;
};
class ItemTroutCooked : FoodEdible {
scope = public;
displayName = "Rainbow Trout (Cooked)";
descriptionShort = "Rainbow Trout: A small fish that can be fairly easy to catch.";
model = "\z\addons\dayz_epoch\models\trout_cooked.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_trout_cooked_CA.paa";
bloodRegen = 800;
};
class ItemSeaBassCooked : FoodEdible {
scope = public;
displayName = "Sea Bass (Cooked)";
descriptionShort = "Sea Bass: A medium sized fish that is fairly rare.";
model = "\z\addons\dayz_epoch\models\seabass_cooked.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_seabass_cooked_CA.paa";
bloodRegen = 1600;
};
class ItemTunaCooked : FoodEdible {
scope = public;
displayName = "Blue Fin Tuna (Cooked)";
descriptionShort = "Blue Fin Tuna: A very large and hard to catch fish. Sushi anyone?";
model = "\z\addons\dayz_epoch\models\tuna_cooked.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_tuna_cooked_CA.paa";
bloodRegen = 5000;
};
class FoodBioMeat: FoodEdible {
scope = public;
displayName = "Bio Meat";

359
SQF/dayz_code/Configs/CfgMagazines/Food.hpp
View File

@@ -1,359 +0,0 @@
class FoodEdible;
class FoodCanFrankBeans: FoodEdible {
scope = public;
// displayName = $STR_EQUIP_NAME_28;
displayName = "Can (Frank n Beans)"; // addactions cannot have &
model = "\dayz_equip\models\food_fbtin.p3d";
picture = "\dayz_equip\textures\equip_fbtin_ca.paa";
descriptionShort = $STR_EQUIP_DESC_28;
};
class FoodmeatRaw : FoodEdible {
scope = public;
count = 1;
type = 256;
displayName = $STR_FOOD_EQIP_CODE_NAME_0;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_0;
bloodRegen = 100;
};
class FoodmuttonRaw : FoodmeatRaw {
displayName = $STR_FOOD_EQIP_CODE_NAME_1;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_1;
bloodRegen = 100;
};
class FoodchickenRaw : FoodmeatRaw {
displayName = $STR_FOOD_EQIP_CODE_NAME_2;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_2;
bloodRegen = 100;
};
class FoodrabbitRaw : FoodmeatRaw {
displayName = $STR_FOOD_EQIP_CODE_NAME_3;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_3;
bloodRegen = 400;
};
class FoodbaconRaw : FoodmeatRaw {
displayName = $STR_FOOD_EQIP_CODE_NAME_4;
model = "z\addons\dayz_communityassets\models\bacon_raw.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_raw_CA.paa";
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_4;
bloodRegen = 150;
};
class FoodbeefRaw : FoodmeatRaw {
displayName = $STR_FOOD_EQIP_CODE_NAME_6;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_6;
bloodRegen = 100;
};
class FoodmeatCooked : FoodEdible {
scope = public;
count = 1;
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_0;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_0;
bloodRegen = 800;
};
class FoodmuttonCooked : FoodmeatCooked {
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_1;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_1;
bloodRegen = 400;
};
class FoodchickenCooked : FoodmeatCooked {
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_2;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_2;
bloodRegen = 400;
};
class FoodbaconCooked : FoodmeatCooked {
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_4;
model = "z\addons\dayz_communityassets\models\bacon_fried.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_fried_CA.paa";
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_4;
bloodRegen = 400;
};
class FoodrabbitCooked : FoodmeatCooked {
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_3;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_3;
bloodRegen = 1600;
};
class FoodbeefCooked : FoodmeatCooked {
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_6;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_6;
bloodRegen = 600;
};
class AngelCookies : FoodEdible {
scope = public;
count = 1;
displayName = $STR_FOODCOOKED_EQIP_CODE_NAME_5;
model = "z\addons\dayz_communityassets\models\buiscits_box.p3d";
picture = "z\addons\dayz_communityassets\pictures\i_buiscit_ca.paa";
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_5;
bloodRegen = 100;
};
class FoodMRE : FoodEdible {
scope = public;
count = 1;
bloodRegen = 800;
displayName = $STR_FOOD_NAME_MRE;
descriptionShort = $STR_FOOD_DESC_MRE;
model = "z\addons\dayz_communityassets\models\mre.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_mre_CA.paa";
};
class FoodPistachio : FoodEdible {
scope = public;
count = 1;
bloodRegen = 100;
displayName = $STR_FOOD_NAME_PISTACHIO;
descriptionShort = $STR_FOOD_DESC_PISTACHIO;
model = "z\addons\dayz_communityassets\models\pistachio.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_pistachios_CA.paa";
};
class FoodNutmix : FoodEdible {
scope = public;
count = 1;
bloodRegen = 100;
displayName = $STR_FOOD_NAME_NUTMIX;
descriptionShort = $STR_FOOD_DESC_NUTMIX;
model = "z\addons\dayz_communityassets\models\nutmix.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_nutmix_CA.paa";
};
class FoodCanGriff : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_GRIFF;
descriptionShort = $STR_FOOD_DESC_CAN_GRIFF;
model = "z\addons\dayz_communityassets\models\can_griff_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_griff_clean_full_ca.paa";
};
class FoodCanBadguy : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_BADGUY;
descriptionShort = $STR_FOOD_DESC_CAN_BADGUY;
model = "z\addons\dayz_communityassets\models\can_badguy_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_badguy_clean_full_ca.paa";
};
class FoodCanBoneboy : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_BONEBOY;
descriptionShort = $STR_FOOD_DESC_CAN_BONEBOY;
model = "z\addons\dayz_communityassets\models\can_boneboy_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_boneboy_clean_full_ca.paa";
};
class FoodCanCorn : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_CORN;
descriptionShort = $STR_FOOD_DESC_CAN_CORN;
model = "z\addons\dayz_communityassets\models\can_corn_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_corn_clean_full_ca.paa";
};
class FoodCanCurgon : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_CURGON;
descriptionShort = $STR_FOOD_DESC_CAN_CURGON;
model = "z\addons\dayz_communityassets\models\can_curgon_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_curgon_clean_full_ca.paa";
};
class FoodCanDemon : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_DEMON;
descriptionShort = $STR_FOOD_DESC_CAN_DEMON;
model = "z\addons\dayz_communityassets\models\can_demon_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_demon_clean_full_ca.paa";
};
class FoodCanFraggleos : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_FRAGGLEOS;
descriptionShort = $STR_FOOD_DESC_CAN_FRAGGLEOS;
model = "z\addons\dayz_communityassets\models\can_fraggleos_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_fraggleos_clean_full_ca.paa";
};
class FoodCanHerpy : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_HERPY;
descriptionShort = $STR_FOOD_DESC_CAN_HERPY;
model = "z\addons\dayz_communityassets\models\can_herpy_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_herpy_clean_full_ca.paa";
};
class FoodCanOrlok : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_ORLOK;
descriptionShort = $STR_FOOD_DESC_CAN_ORLOK;
model = "z\addons\dayz_communityassets\models\can_orlok_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_orlok_clean_full_ca.paa";
};
class FoodCanPowell : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_POWELL;
descriptionShort = $STR_FOOD_DESC_CAN_POWELL;
model = "z\addons\dayz_communityassets\models\can_powell_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_powell_clean_full_ca.paa";
};
class FoodCanTylers : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_TYLERS;
descriptionShort = $STR_FOOD_DESC_CAN_TYLERS;
model = "z\addons\dayz_communityassets\models\can_tylers_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_tylers_clean_full_ca.paa";
};
class FoodCanUnlabeled : FoodEdible {
scope = public;
count = 1;
bloodRegen = 200;
displayName = $STR_FOOD_NAME_CAN_UNLABELED;
descriptionShort = $STR_FOOD_DESC_CAN_UNLABELED;
model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_full_ca.paa";
};
class TrashTinCan: HandGrenade {
scope = public;
displayName = $STR_EQUIP_NAME_33;
model = "\dayz_equip\models\trash_tincan.p3d";
picture = "\dayz_equip\textures\equip_tincan_ca.paa";
descriptionShort = $STR_EQUIP_DESC_33;
ammo = "TinCan";
class ItemActions {
class Crafting {
text = "Melt into Bars";
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"fire"};
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemTinBar",1}};
input[] = {{"TrashTinCan",6}};
};
};
};
class FoodCanGriffEmpty : TrashTinCan {
scope = public;
count = 1;
model = "z\addons\dayz_communityassets\models\can_griff_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_griff_clean_empty_ca.paa";
displayName = $STR_FOOD_NAME_CAN_GRIFF_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_GRIFF_EMPTY;
ammo = "TinCan";
};
class FoodCanBadguyEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_BADGUY_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_BADGUY_EMPTY;
model = "z\addons\dayz_communityassets\models\can_badguy_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_badguy_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanBoneboyEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_BONEBOY_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_BONEBOY_EMPTY;
model = "z\addons\dayz_communityassets\models\can_boneboy_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_boneboy_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanCornEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_CORN_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_CORN_EMPTY;
model = "z\addons\dayz_communityassets\models\can_corn_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_corn_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanCurgonEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_CURGON_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_CURGON_EMPTY;
model = "z\addons\dayz_communityassets\models\can_curgon_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_curgon_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanDemonEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_DEMON_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_DEMON_EMPTY;
model = "z\addons\dayz_communityassets\models\can_demon_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_demon_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanFraggleosEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_FRAGGLEOS_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_FRAGGLEOS_EMPTY;
model = "z\addons\dayz_communityassets\models\can_fraggleos_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_fraggleos_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanHerpyEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_HERPY_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_HERPY_EMPTY;
model = "z\addons\dayz_communityassets\models\can_herpy_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_herpy_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanOrlokEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_ORLOK_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_ORLOK_EMPTY;
model = "z\addons\dayz_communityassets\models\can_orlok_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_orlok_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanPowellEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_POWELL_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_POWELL_EMPTY;
model = "z\addons\dayz_communityassets\models\can_powell_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_powell_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanTylersEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_TYLERS_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_TYLERS_EMPTY;
model = "z\addons\dayz_communityassets\models\can_tylers_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_tylers_clean_empty_ca.paa";
ammo = "TinCan";
};
class FoodCanUnlabeledEmpty : TrashTinCan {
scope = public;
count = 1;
displayName = $STR_FOOD_NAME_CAN_UNLABELED_EMPTY;
descriptionShort = $STR_FOOD_DESC_CAN_UNLABELED_EMPTY;
model = "z\addons\dayz_communityassets\models\can_unlabeled_clean_empty.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_can_unlabeled_clean_empty_ca.paa";
ammo = "TinCan";
};

16
SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp
View File

@@ -16,6 +16,14 @@ class ItemSodaEmpty : HandGrenade
text = "Drink";//TODO: move to stringtable
script = "spawn player_drinkWater;";
};
class Crafting {
text = "Melt into Bars";
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"fire"};
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemAluminumBar",1}};
input[] = {{"ItemSodaEmpty",6}};
};
};
};
@@ -37,6 +45,14 @@ class TrashTinCan : HandGrenade
text = "Drink";//TODO: move to stringtable
script = "spawn player_drinkWater;";
};
class Crafting {
text = "Melt into Bars";
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {"fire"};
requiretools[] = {"ItemToolbox"};
output[] = {{"ItemTinBar",1}};
input[] = {{"TrashTinCan",6}};
};
};
};

49
SQF/dayz_code/Configs/CfgWeapons/Melee/FishingPole.hpp
View File

@@ -1,44 +1,27 @@
class MeleeFishingPole: MeleeWeapon
class MeleeFishingPole : MeleeWeapon
{
scope = public;
autoreload=1;
magazineReloadTime=0;
model="\z\addons\dayz_epoch\models\fishing_rod_weaponized.p3d";
picture="\z\addons\dayz_epoch\pictures\equip_fishingpole_CA.paa";
displayName=$STR_EQUIP_FISHPOLE;
magazines[]=
{
"Fishing_Swing"
};
handAnim[]=
{
"OFP2_ManSkeleton",
"\dayz_weapons\anim\melee_hatchet_holding.rtm"
};
model = "\z\addons\dayz_communityassets\models\fishing_rod_weaponized.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_fishingpole_CA.paa";
displayName = $STR_ITEM_NAME_FISHINGPOLE;
descriptionShort = $STR_ITEM_DESC_FISHINGPOLE;
magazines[] = {"Fishing_Swing"};
class ItemActions
{
class Use
{
text=$STR_EPOCH_PLAYER_297;
script="spawn player_goFishing;";
};
class Toolbelt
{
text=$STR_EPOCH_PLAYER_296;
script="spawn player_addToolbelt;";
use[]=
{
"MeleeFishingPole"
};
output[]=
{
"ItemFishingPole"
};
text = $STR_ACTIONS_2TB;
script = "spawn player_addToolbelt";
use[] = {"MeleeFishingPole"};
output[] = {"ItemFishingPole"};
};
};
class Library
{
libTextDesc="";
libTextDesc = $STR_ITEM_DESC_FISHINGPOLE;
};
descriptionShort=$STR_EQUIP_FISHPOLE_DESC;
};
};

2
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp
View File

@@ -21,7 +21,7 @@ class MeleeSledge: MeleeWeapon
{
class Toolbelt
{
text=$STR_EPOCH_PLAYER_296;
text=$STR_ACTIONS_2TB;
script="spawn player_addToolbelt;";
use[]=
{

14
SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp
View File

@@ -1,10 +1,12 @@
class ItemFishingPole: ItemCore
class ItemFishingPole : ItemCore
{
scope = public;
displayName=$STR_EQUIP_FISHPOLE;
model="\z\addons\dayz_epoch\models\fishing_rod_loot_item.p3d";
picture="\z\addons\dayz_epoch\pictures\equip_fishingpole_CA.paa";
descriptionShort=$STR_EQUIP_FISHPOLE_DESC;
model = "\z\addons\dayz_communityassets\models\fishing_rod_loot_item.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_fishingpole_CA.paa";
displayName = $STR_ITEM_NAME_FISHINGPOLE;
descriptionShort = $STR_ITEM_DESC_FISHINGPOLE;
class ItemActions
{
class Toolbelt
@@ -35,4 +37,4 @@ class ItemFishingPole: ItemCore
};
};
};
};
};