W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-03-01 11:11:52 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up, change strings for better mod compatibility

Browse Source 
Also streamlining the names of certain items like fuel cans, fish, meat with a status indicator behind the name.

Fix some wrong description strings.

Add blunt hatchet and wet matches.
This commit is contained in:
A Man
2021-05-12 19:13:02 +02:00
parent b1e77a3993
commit 69408ab39f
29 changed files with 636 additions and 1212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp
View File

@@ -3,8 +3,8 @@ class FoodGoatRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_NAME_GOAT_RAW;
descriptionShort = $STR_FOOD_EQUIP_GOAT_RAW;
displayName = $STR_EQUIP_FOOD_NAME_GOAT_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_GOAT_RAW;
bloodRegen = 300;
Nutrition[] = {143,300,0,0};
cookOutput = "FoodGoatCooked";
@@ -15,8 +15,8 @@ class FoodGoatCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOOD_NAME_GOAT_COOKED;
descriptionShort = $STR_FOOD_EQUIP_GOAT_COOKED;
displayName = $STR_EQUIP_FOOD_NAME_GOAT_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_GOAT_COOKED;
bloodRegen = 600;
Nutrition[] = {143,600,0,0};
};
@@ -26,8 +26,8 @@ class FoodMuttonRaw : FoodRaw
scope = 2;
model = "z\addons\dayz_communityassets\models\mutton_raw.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_raw_CA.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_1;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_1;
displayName = $STR_EQUIP_FOOD_NAME_MUTTON_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_MUTTON_RAW;
bloodRegen = 400;
Nutrition[] = {294,350,0,0};
cookOutput = "FoodMuttonCooked";
@@ -39,8 +39,8 @@ class FoodMuttonCooked : FoodCooked
model = "z\addons\dayz_communityassets\models\mutton_cooked.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_cooked_CA.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_1;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_1;
displayName = $STR_EQUIP_FOOD_NAME_MUTTON_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_MUTTON_COOKED;
bloodRegen = 800;
Nutrition[] = {294,700,0,0};
};
@@ -50,8 +50,8 @@ class FoodChickenRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_2;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_2;
displayName = $STR_EQUIP_FOOD_NAME_CHICKEN_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_CHICKEN_RAW;
bloodRegen = 400;
Nutrition[] = {219,350,0,0};
cookOutput = "FoodChickenCooked";
@@ -62,8 +62,8 @@ class FoodChickenCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_2;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_2;
displayName = $STR_EQUIP_FOOD_NAME_CHICKEN_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_CHICKEN_COOKED;
bloodRegen = 800;
Nutrition[] = {219,700,0,0};
};
@@ -73,8 +73,8 @@ class FoodBaconRaw : FoodRaw
scope = 2;
model = "z\addons\dayz_communityassets\models\bacon_raw.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_raw_CA.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_4;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_4;
displayName = $STR_EQUIP_FOOD_NAME_BACON_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_BACON_RAW;
bloodRegen = 300;
Nutrition[] = {417,350,0,0};
cookOutput = "FoodBaconCooked";
@@ -85,8 +85,8 @@ class FoodBaconCooked : FoodCooked
scope = 2;
model = "z\addons\dayz_communityassets\models\bacon_fried.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_fried_CA.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_4;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_4;
displayName = $STR_EQUIP_FOOD_NAME_BACON_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_BACON_COOKED;
bloodRegen = 600;
Nutrition[] = {417,700,0,0};
};
@@ -96,8 +96,8 @@ class FoodRabbitRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_3;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_3;
displayName = $STR_EQUIP_FOOD_NAME_RABBIT_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_RABBIT_RAW;
bloodRegen = 500;
Nutrition[] = {517,450,0,0};
cookOutput = "FoodRabbitCooked";
@@ -108,8 +108,8 @@ class FoodRabbitCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_3;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_3;
displayName = $STR_EQUIP_FOOD_NAME_RABBIT_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_RABBIT_COOKED;
bloodRegen = 1000;
Nutrition[] = {517,900,0,0};
};
@@ -119,8 +119,8 @@ class FoodBeefRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_EQUIP_CODE_NAME_6;
descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_6;
displayName = $STR_EQUIP_FOOD_NAME_BEEF_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_BEEF_RAW;
bloodRegen = 400;
Nutrition[] = {332,350,0,0};
cookOutput = "FoodBeefCooked";
@@ -131,8 +131,8 @@ class FoodBeefCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_6;
descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_6;
displayName = $STR_EQUIP_FOOD_NAME_BEEF_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_BEEF_COOKED;
bloodRegen = 800;
Nutrition[] = {332,700,0,0};
};
@@ -142,8 +142,8 @@ class FoodDogRaw : FoodRaw
scope = 2;
model = "\dayz_equip\models\food_steak_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_ca.paa";
displayName = $STR_FOOD_NAME_DOG_RAW;
descriptionShort = $STR_EQUIP_DESC_47;
displayName = $STR_EQUIP_FOOD_NAME_DOG_RAW;
descriptionShort = $STR_EQUIP_FOOD_DESC_DOG_RAW;
bloodRegen = 300;
Nutrition[] = {143,300,0,0};
cookOutput = "FoodDogCooked";
@@ -154,8 +154,8 @@ class FoodDogCooked : FoodCooked
scope = 2;
model = "\dayz_equip\models\food_steak_cooked_gear.p3d";
picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa";
displayName = $STR_FOOD_NAME_DOG_COOKED;
descriptionShort = $STR_EQUIP_DESC_25;
displayName = $STR_EQUIP_FOOD_NAME_DOG_COOKED;
descriptionShort = $STR_EQUIP_FOOD_DESC_DOG_COOKED;
bloodRegen = 600;
Nutrition[] = {143,600,0,0};
};

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

@@ -388,8 +388,8 @@ class FoodCanBakedBeans : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_bbtin.p3d";
picture = "\dayz_equip\textures\equip_bbtin_ca.paa";
displayName = $STR_EQUIP_NAME_26;
descriptionShort = $STR_EQUIP_DESC_26;
displayName = $STR_EQUIP_NAME_BAKED_BEANS;
descriptionShort = $STR_EQUIP_DESC_BAKED_BEANS;
bloodRegen = 100;
Nutrition[] = {0,400,320,0};
consumeOutput = "FoodCanUnlabeledEmpty";
@@ -400,8 +400,8 @@ class FoodCanSardines : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_sardinestin.p3d";
picture = "\dayz_equip\textures\equip_Sardinestin_ca.paa";
displayName = $STR_EQUIP_NAME_27;
descriptionShort = $STR_EQUIP_DESC_27;
displayName = $STR_EQUIP_NAME_SARDINES;
descriptionShort = $STR_EQUIP_DESC_SARDINES;
bloodRegen = 100;
Nutrition[] = {0,450,320,0};
consumeOutput = "FoodCanUnlabeledEmpty";
@@ -412,8 +412,8 @@ class FoodCanFrankBeans : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_fbtin.p3d";
picture = "\dayz_equip\textures\equip_fbtin_ca.paa";
displayName = $STR_EQUIP_NAME_28;
descriptionShort = $STR_EQUIP_DESC_28;
displayName = $STR_EQUIP_NAME_FRANK_BEANS;
descriptionShort = $STR_EQUIP_DESC_FRANK_BEANS;
bloodRegen = 100;
Nutrition[] = {0,450,320,0};
consumeOutput = "FoodCanUnlabeledEmpty";
@@ -424,8 +424,8 @@ class FoodCanPasta : FoodPackaged
scope = 2;
model = "\dayz_equip\models\food_pastatin.p3d";
picture = "\dayz_equip\textures\equip_pastatin_ca.paa";
displayName = $STR_EQUIP_NAME_29;
descriptionShort = $STR_EQUIP_DESC_29;
displayName = $STR_EQUIP_NAME_PASTA;
descriptionShort = $STR_EQUIP_DESC_PASTA;
bloodRegen = 100;
Nutrition[] = {0,500,0,0};
consumeOutput = "FoodCanUnlabeledEmpty";

23
SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp
View File

@@ -3,8 +3,8 @@ class ItemSodaCoke : ItemSoda
scope = 2;
model = "\dayz_equip\models\soda_coke.p3d";
picture = "\dayz_equip\textures\equip_soda_coke_ca.paa";
displayName = $STR_EQUIP_NAME_36a;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_EQUIP_NAME_SODA_CAN_COKE;
descriptionShort = $STR_EQUIP_DESC_SODA_CAN;
Nutrition[] = {90,0,300,0};
};
@@ -13,8 +13,8 @@ class ItemSodaPepsi : ItemSoda
scope = 2;
model = "\dayz_equip\models\soda_pepsi.p3d";
picture = "\dayz_equip\textures\equip_soda_pepsi_ca.paa";
displayName = $STR_EQUIP_NAME_36b;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_EQUIP_NAME_SODA_CAN_PEPSI;
descriptionShort = $STR_EQUIP_DESC_SODA_CAN;
Nutrition[] = {90,0,300,0};
};
@@ -23,8 +23,8 @@ class ItemSodaMdew : ItemSoda
scope = 2;
model = "\dayz_equip\models\soda_mdew.p3d";
picture = "\dayz_equip\textures\equip_soda_mdew_ca.paa";
displayName = $STR_EQUIP_NAME_37;
descriptionShort = $STR_EQUIP_NAME_37;
displayName = $STR_EQUIP_NAME_MOUNTAIN_DEW;
descriptionShort = $STR_EQUIP_DESC_MOUNTAIN_DEW;
Nutrition[] = {90,0,400,0};
};
@@ -110,12 +110,11 @@ class ItemSodaLemonade : ItemSoda
class ItemSodaLirik : ItemSoda
{
scope = 2;
scope = 2;
model = "z\addons\dayz_communityassets\models\soda_lirik_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_soda_lirik_clean_full_ca.paa";
displayName = $STR_EQUIP_NAME_36a;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_7;
descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_7;
Nutrition[] = {90,0,300,0};
consumeOutput = "ItemSodaLirikEmpty";
};
@@ -147,8 +146,8 @@ class ItemSodaPeppsy : ItemSoda
scope = 2;
model = "z\addons\dayz_communityassets\models\soda_peppsy_clean_full.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_soda_peppsy_clean_full_ca.paa";
displayName = $STR_EQUIP_NAME_36b;
descriptionShort = $STR_EQUIP_DESC_36;
displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_10;
descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_10;
Nutrition[] = {90,0,300,0};
consumeOutput = "ItemSodaPeppsyEmpty";
};

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

@@ -3,8 +3,8 @@ class ItemWaterBottle : FoodDrink
scope = 2;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa";
displayName = $STR_EQUIP_NAME_12;
descriptionShort = $STR_EQUIP_DESC_12;
displayName = $STR_EQUIP_NAME_WATER_BOTTLE;
descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE;
Nutrition[] = {0,0,1000,0};
@@ -81,8 +81,8 @@ class ItemWaterBottleUnfilled : CA_Magazine
type = 256;
model = "\dayz_equip\models\waterbottle_gear.p3d";
picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
displayName = $STR_EQUIP_NAME_13;
descriptionShort = $STR_EQUIP_DESC_13;
displayName = $STR_EQUIP_NAME_WATER_BOTTLE_EMPTY;
descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE_EMPTY;
containerWater = "ItemWaterBottle";
containerWaterSafe = "ItemWaterBottleSafe";
containerWaterInfected = "ItemWaterBottleInfected";