W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-25 01:20:49 +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

8
SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp
View File

@@ -3,8 +3,8 @@ class ItemEtool : ItemCore
scope = 2;
model = "\dayz_equip\models\etool.p3d";
picture = "\dayz_equip\textures\equip_etool_ca.paa";
displayName = $STR_EQUIP_NAME_1;
descriptionShort = $STR_EQUIP_DESC_1;
displayName = $STR_EQUIP_NAME_ETOOL;
descriptionShort = $STR_EQUIP_DESC_ETOOL;
};
class ItemEtoolBroken : ItemCore
@@ -12,8 +12,8 @@ class ItemEtoolBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\etool.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemEtoolBroken.paa";
displayName = $STR_EQUIP_NAME_1_BROKEN;
descriptionShort = $STR_EQUIP_DESC_1_BROKEN;
displayName = $STR_EQUIP_NAME_ETOOL_BROKEN;
descriptionShort = $STR_EQUIP_DESC_ETOOL_BROKEN;
class ItemActions
{

24
SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp
View File

@@ -3,8 +3,8 @@ class ItemFlashlight : ItemCore
scope = 2;
model = "\dayz_equip\models\flashlight.p3d";
picture = "\dayz_equip\textures\equip_flashlight_ca.paa";
displayName = $STR_EQUIP_NAME_5;
descriptionShort = $STR_EQUIP_DESC_5;
displayName = $STR_EQUIP_NAME_FLASHLIGHT;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT;
class ItemActions
{
@@ -23,8 +23,8 @@ class ItemFlashlightBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\flashlight.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemFlashlightBroken.paa";
displayName = $STR_EQUIP_NAME_5_BROKEN;
descriptionShort = $STR_EQUIP_DESC_5_BROKEN;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_BROKEN;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_BROKEN;
};
class MeleeFlashlight : Pistol
@@ -32,8 +32,8 @@ class MeleeFlashlight : Pistol
scope = 2;
model = "\dayz_equip\models\flashlight.p3d";
picture = "\dayz_equip\textures\equip_flashlight_ca.paa";
displayName = $STR_EQUIP_NAME_5;
descriptionShort = $STR_EQUIP_DESC_5;
displayName = $STR_EQUIP_NAME_FLASHLIGHT;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT;
modelOptics = "-";
magazines[] = {};
@@ -65,8 +65,8 @@ class ItemFlashlightRed : ItemFlashlight
{
model = "\dayz_equip\models\flashlight_mil.p3d";
picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa";
displayName = $STR_EQUIP_NAME_6;
descriptionShort = $STR_EQUIP_DESC_6;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY;
class ItemActions
{
@@ -85,16 +85,16 @@ class ItemFlashlightRedBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\flashlight_mil.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemMilitaryFlashlightBroken.paa";
displayName = $STR_EQUIP_NAME_6_BROKEN;
descriptionShort = $STR_EQUIP_DESC_6_BROKEN;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY_BROKEN;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY_BROKEN;
};
class MeleeFlashlightRed : MeleeFlashlight
{
model = "\dayz_equip\models\flashlight_mil.p3d";
picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa";
displayName = $STR_EQUIP_NAME_6;
descriptionShort = $STR_EQUIP_DESC_6;
displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY;
descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY;
class FlashLight
{

18
SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp
View File

@@ -48,4 +48,22 @@ class ItemHatchetBroken : ItemCore
inputweapons[] = {"ItemHatchetBroken"};
};
};
};
class ItemHatchetBlunt : ItemCore
{
scope = 2;
picture = "\dayz_epoch_c\icons\tools\ItemHatchetBroken.paa";
model = "\dayz_equip\models\hatchet.p3d";
displayName = $STR_EQUIP_NAME_HATCHET_DULL;
descriptionShort = $STR_EQUIP_DESC_HATCHET_DULL;
class ItemActions
{
class SharpenHatchet
{
text = $STR_ACTIONS_SHARPEN_HATCHET;
script = "; ['ItemHatchetBlunt','ItemHatchet'] spawn player_sharpen;";
};
};
};

19
SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp
View File

@@ -3,7 +3,7 @@ class ItemKnife_Base : ItemCore
scope = 0;
model = "\dayz_equip\models\knife_gear.p3d";
picture = "\dayz_equip\textures\equip_knife_ca.paa";
displayName = $STR_EQUIP_NAME_4;
displayName = $STR_EQUIP_NAME_KNIFE;
class ItemActions
{
@@ -20,55 +20,56 @@ class ItemKnife : ItemKnife_Base
scope = 2;
model = "\dayz_equip\models\knife_gear.p3d"; // Some mods override this. We leave this here just to be sure.
picture = "\dayz_equip\textures\equip_knife_ca.paa";
descriptionShort = $STR_EQUIP_DESC_4;
descriptionShort = $STR_EQUIP_DESC_KNIFE;
sharpnessRemaining = "ItemKnife5";
};
class ItemKnife5 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_A;
descriptionShort = $STR_EQUIP_DESC_KNIFE_5;
sharpnessRemaining = "ItemKnife4";
};
class ItemKnife4 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_B;
descriptionShort = $STR_EQUIP_DESC_KNIFE_4;
sharpnessRemaining = "ItemKnife3";
};
class ItemKnife3 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_C;
descriptionShort = $STR_EQUIP_DESC_KNIFE_3;
sharpnessRemaining = "ItemKnife2";
};
class ItemKnife2 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_D;
descriptionShort = $STR_EQUIP_DESC_KNIFE_2;
sharpnessRemaining = "ItemKnife1";
};
class ItemKnife1 : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_DESC_4_E;
descriptionShort = $STR_EQUIP_DESC_KNIFE_1;
sharpnessRemaining = "ItemKnifeBlunt";
};
class ItemKnifeBlunt : ItemKnife_Base
{
scope = 2;
descriptionShort = $STR_EQUIP_CODE_DESC_4;
displayName = $STR_EQUIP_NAME_KNIFE_DULL;
descriptionShort = $STR_EQUIP_DESC_KNIFE_DULL;
sharpnessRemaining = "ItemKnifeBlunt";
class ItemActions
{
class FixKnife
{
text = $STR_ACTIONS_FIX_KNIFE;
text = $STR_ACTIONS_SHARPEN_KNIFE;
script = "; ['ItemKnifeBlunt','ItemKnife'] spawn player_sharpen;";
};
class Use

26
SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
View File

@@ -3,16 +3,24 @@ class ItemMatchbox_base : ItemCore
scope = 0;
model = "\dayz_equip\models\matchbox_gear.p3d";
picture = "\dayz_equip\textures\equip_matchbox_ca.paa";
displayName = $STR_EQUIP_NAME_3;
descriptionShort = $STR_EQUIP_DESC_3;
displayName = $STR_EQUIP_NAME_MATCHES;
descriptionShort = $STR_EQUIP_DESC_MATCHES;
};
class ItemMatchboxWet : ItemMatchbox_base
{
scope = 2;
picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa";
displayName = $STR_EQUIP_NAME_MATCHES_WET;
descriptionShort = $STR_EQUIP_DESC_MATCHES_WET;
};
class ItemMatchboxEmpty : ItemMatchbox_base
{
scope = 2;
picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa";
displayName = $STR_EQUIP_NAME_3_EMPTY;
descriptionShort = $STR_EQUIP_DESC_3_EMPTY;
displayName = $STR_EQUIP_NAME_MATCHES_EMPTY;
descriptionShort = $STR_EQUIP_DESC_MATCHES_EMPTY;
};
//Loot Spawn Table.
@@ -38,35 +46,35 @@ class ItemMatchbox : ItemMatchbox_base
class Item5Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_5;
descriptionShort = $STR_EQUIP_DESC_3_A;
descriptionShort = $STR_EQUIP_DESC_MATCHES_5;
matches = 5;
qtyRemaining = "Item4Matchbox";
};
class Item4Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_4;
descriptionShort = $STR_EQUIP_DESC_3_B;
descriptionShort = $STR_EQUIP_DESC_MATCHES_4;
qtyRemaining = "Item3Matchbox";
matches = 4;
};
class Item3Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_3;
descriptionShort = $STR_EQUIP_DESC_3_C;
descriptionShort = $STR_EQUIP_DESC_MATCHES_3;
qtyRemaining = "Item2Matchbox";
matches = 3;
};
class Item2Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_2;
descriptionShort = $STR_EQUIP_DESC_3_D;
descriptionShort = $STR_EQUIP_DESC_MATCHES_2;
qtyRemaining = "Item1Matchbox";
matches = 2;
};
class Item1Matchbox : ItemMatchbox
{
displayName = $STR_EQUIP_NAME_MATCHES_1;
descriptionShort = $STR_EQUIP_DESC_3_E;
descriptionShort = $STR_EQUIP_DESC_MATCHES_1;
qtyRemaining = "ItemMatchboxEmpty";
matches = 1;
};

8
SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp
View File

@@ -3,8 +3,8 @@ class ItemShovel : ItemCore
scope = 2;
model = "\z\addons\dayz_communityassets\models\shovel.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemShovel.paa";
displayName = $STR_EQUIP_NAME_1b;
descriptionShort = $STR_EQUIP_DESC_1b;
displayName = $STR_EQUIP_NAME_SHOVEL;
descriptionShort = $STR_EQUIP_DESC_SHOVEL;
};
class ItemShovelBroken : ItemCore
@@ -12,8 +12,8 @@ class ItemShovelBroken : ItemCore
scope = 2;
model = "\z\addons\dayz_communityassets\models\shovel.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemShovelBroken.paa";
displayName = $STR_EQUIP_NAME_1b_BROKEN;
descriptionShort = $STR_EQUIP_DESC_1b_BROKEN;
displayName = $STR_EQUIP_NAME_SHOVEL_BROKEN;
descriptionShort = $STR_EQUIP_DESC_SHOVEL_BROKEN;
class ItemActions
{

8
SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp
View File

@@ -3,8 +3,8 @@ class ItemToolbox : ItemCore
scope = 2;
model = "\dayz_equip\models\toolbox.p3d";
picture = "\dayz_equip\textures\equip_toolbox_ca.paa";
displayName = $STR_EQUIP_NAME_2;
descriptionShort = $STR_EQUIP_DESC_2;
displayName = $STR_EQUIP_NAME_TOOLBOX;
descriptionShort = $STR_EQUIP_DESC_TOOLBOX;
class ItemActions
{
@@ -21,6 +21,6 @@ class ItemToolboxBroken : ItemCore
scope = 2;
model = "\dayz_equip\models\toolbox.p3d";
picture = "\dayz_epoch_c\icons\tools\ItemToolboxBroken.paa";
displayName = $STR_EQUIP_NAME_2_BROKEN;
descriptionShort = $STR_EQUIP_DESC_2_BROKEN;
displayName = $STR_EQUIP_NAME_TOOLBOX_BROKEN;
descriptionShort = $STR_EQUIP_DESC_TOOLBOX_BROKEN;
};