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

merge in #747

Browse Source
This commit is contained in:
[VB]AWOL
2013-11-21 10:39:24 -06:00
parent aca098f7ea
commit f1729e06e2
20 changed files with 241 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

2
SQF/dayz_code/Configs/CfgVehicles/Females/females.hpp
View File

@@ -2,7 +2,7 @@
class Soldier_Bodyguard_M4_PMC; class Soldier_Bodyguard_M4_PMC;
class SurvivorW2_DZ: Soldier_Bodyguard_M4_PMC class SurvivorW2_DZ: Soldier_Bodyguard_M4_PMC
{ {
displayName = "$STR_CHAR_1"; displayName = $STR_CHAR_1;
side = 1; side = 1;
weapons[] = {"Throw","Put"}; weapons[] = {"Throw","Put"};
model = "\dayz\characters\annie_original"; model = "\dayz\characters\annie_original";

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

@@ -24,19 +24,19 @@ class CfgWeapons {
class ItemMatchbox_DZE: ItemCore class ItemMatchbox_DZE: ItemCore
{ {
scope = 2; scope = 2;
displayName = "$STR_EQUIP_NAME_3"; displayName = $STR_EQUIP_NAME_3;
model = "\dayz_equip\models\matchbox_gear.p3d"; model = "\dayz_equip\models\matchbox_gear.p3d";
picture = "\dayz_equip\textures\equip_matchbox_ca.paa"; picture = "\dayz_equip\textures\equip_matchbox_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_3"; descriptionShort = $STR_EQUIP_DESC_3;
}; };
class ItemKnife: ItemCore class ItemKnife: ItemCore
{ {
scope = 2; scope = 2;
displayName = "$STR_EQUIP_NAME_4"; displayName = $STR_EQUIP_NAME_4;
model = "\dayz_equip\models\knife_gear.p3d"; model = "\dayz_equip\models\knife_gear.p3d";
picture = "\dayz_equip\textures\equip_knife_ca.paa"; picture = "\dayz_equip\textures\equip_knife_ca.paa";
descriptionShort = "$STR_EQUIP_DESC_4"; descriptionShort = $STR_EQUIP_DESC_4;
class ItemActions class ItemActions
{ {
class Use class Use

2
SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp
View File

@@ -1,7 +1,7 @@
class Flare : GrenadeLauncher { class Flare : GrenadeLauncher {
class ThrowMuzzle; class ThrowMuzzle;
class MolotovCocktailMuzzle : ThrowMuzzle { class MolotovCocktailMuzzle : ThrowMuzzle {
displayName = "$STR_ACTION_THROW"; displayName = $STR_ACTION_THROW;
magazines[] = { magazines[] = {
"TrashJackDaniels", "TrashJackDaniels",
"ItemSodaEmpty", "ItemSodaEmpty",

8
SQF/dayz_code/Configs/CfgWeapons/Item/Flashlight.hpp
View File

@@ -1,7 +1,7 @@
class MeleeFlashlight : Pistol { class MeleeFlashlight : Pistol {
class ItemActions { class ItemActions {
class Toolbelt { class Toolbelt {
text = "$STR_EPOCH_PLAYER_300"; text = $STR_EPOCH_PLAYER_296;
}; };
}; };
}; };
@@ -9,7 +9,7 @@ class MeleeFlashlight : Pistol {
class ItemFlashlight : ItemCore { class ItemFlashlight : ItemCore {
class ItemActions { class ItemActions {
class Toolbelt { class Toolbelt {
text = "$STR_EPOCH_PLAYER_299"; text = $STR_EPOCH_PLAYER_295;
}; };
}; };
}; };
@@ -17,7 +17,7 @@ class MeleeFlashlight : Pistol {
class MeleeFlashlightRed : MeleeFlashlight { class MeleeFlashlightRed : MeleeFlashlight {
class ItemActions { class ItemActions {
class Toolbelt { class Toolbelt {
text = "$STR_EPOCH_PLAYER_300"; text = $STR_EPOCH_PLAYER_296;
}; };
}; };
}; };
@@ -25,7 +25,7 @@ class MeleeFlashlight : Pistol {
class ItemFlashlightRed : ItemCore { class ItemFlashlightRed : ItemCore {
class ItemActions { class ItemActions {
class Toolbelt { class Toolbelt {
text = "$STR_EPOCH_PLAYER_299"; text = $STR_EPOCH_PLAYER_295;
}; };
}; };
}; };

2
SQF/dayz_code/Configs/CfgWeapons/Item/ItemFishingPole.hpp
View File

@@ -9,7 +9,7 @@ class ItemFishingPole: ItemCore
{ {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_295"; text=$STR_EPOCH_PLAYER_295;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {

2
SQF/dayz_code/Configs/CfgWeapons/Item/ItemSledge.hpp
View File

@@ -9,7 +9,7 @@ class ItemSledge: ItemCore
{ {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_295"; text=$STR_EPOCH_PLAYER_295;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {

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

@@ -9,7 +9,7 @@ class ItemCrowbar: ItemCore
{ {
class Toolbelt class Toolbelt
{ {
text = "$STR_EPOCH_PLAYER_295"; text = $STR_EPOCH_PLAYER_295;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {

6
SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp
View File

@@ -1,14 +1,14 @@
class ItemHatchet_DZE : ItemCore { class ItemHatchet_DZE : ItemCore {
scope = 2; scope = 2;
displayName = "$STR_EQUIP_NAME_41"; displayName = $STR_EQUIP_NAME_41;
model = "\dayz_equip\models\hatchet.p3d"; model = "\dayz_equip\models\hatchet.p3d";
picture = "\dayz_equip\textures\equip_hatchet_CA.paa"; picture = "\dayz_equip\textures\equip_hatchet_CA.paa";
descriptionShort = "$STR_EQUIP_DESC_41"; descriptionShort = $STR_EQUIP_DESC_41;
class ItemActions { class ItemActions {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_295"; text=$STR_EPOCH_PLAYER_295;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {

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

@@ -9,7 +9,7 @@ class ItemMachete: ItemCore
{ {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_295"; text=$STR_EPOCH_PLAYER_295;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {

8
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeBaseBallBat.hpp
View File

@@ -6,7 +6,7 @@ class MeleeBaseBallBat: MeleeWeapon
magazineReloadTime=0; magazineReloadTime=0;
model="\z\addons\dayz_communityassets\models\baseball_bat_weaponized.p3d"; model="\z\addons\dayz_communityassets\models\baseball_bat_weaponized.p3d";
picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_ca.paa"; picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_ca.paa";
displayName="$STR_EQUIP_NAME_BASEBALLBAT"; displayName=$STR_EQUIP_NAME_BASEBALLBAT;
droppeditem= "MeleeBaseBallBat"; droppeditem= "MeleeBaseBallBat";
magazines[]= magazines[]=
{ {
@@ -19,7 +19,7 @@ class MeleeBaseBallBat: MeleeWeapon
}; };
class Library class Library
{ {
libTextDesc="$STR_EQUIP_DESC_BASEBALLBAT"; libTextDesc=$STR_EQUIP_DESC_BASEBALLBAT;
}; };
descriptionShort="$STR_EQUIP_DESC_BASEBALLBAT"; descriptionShort=$STR_EQUIP_DESC_BASEBALLBAT;
}; };

8
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeBaseBallBatBarbed.hpp
View File

@@ -6,7 +6,7 @@ class MeleeBaseBallBatBarbed: MeleeWeapon
magazineReloadTime=0; magazineReloadTime=0;
model="\z\addons\dayz_communityassets\models\baseball_bat_barbed_weaponized.p3d"; model="\z\addons\dayz_communityassets\models\baseball_bat_barbed_weaponized.p3d";
picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_barbed_ca.paa"; picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_barbed_ca.paa";
displayName="$STR_EQUIP_NAME_BASEBALLBATBARBED"; displayName=$STR_EQUIP_NAME_BASEBALLBATBARBED;
droppeditem= "MeleeBaseBallBatBarbed"; droppeditem= "MeleeBaseBallBatBarbed";
magazines[]= magazines[]=
{ {
@@ -19,7 +19,7 @@ class MeleeBaseBallBatBarbed: MeleeWeapon
}; };
class Library class Library
{ {
libTextDesc="$STR_EQUIP_DESC_BASEBALLBATBARBED"; libTextDesc=$STR_EQUIP_DESC_BASEBALLBATBARBED;
}; };
descriptionShort="$STR_EQUIP_DESC_BASEBALLBATBARBED"; descriptionShort=$STR_EQUIP_DESC_BASEBALLBATBARBED;
}; };

8
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeBaseBallBatNails.hpp
View File

@@ -6,7 +6,7 @@ class MeleeBaseBallBatNails : MeleeWeapon
magazineReloadTime=0; magazineReloadTime=0;
model="\z\addons\dayz_communityassets\models\baseball_bat_nails_weaponized.p3d"; model="\z\addons\dayz_communityassets\models\baseball_bat_nails_weaponized.p3d";
picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_nails_ca.paa"; picture="\z\addons\dayz_communityassets\pictures\equip_baseball_bat_nails_ca.paa";
displayName="$STR_EQUIP_NAME_BASEBALLBATNAILS"; displayName=$STR_EQUIP_NAME_BASEBALLBATNAILS;
droppeditem= "MeleeBaseBallBatNails"; droppeditem= "MeleeBaseBallBatNails";
magazines[]= magazines[]=
{ {
@@ -19,7 +19,7 @@ class MeleeBaseBallBatNails : MeleeWeapon
}; };
class Library class Library
{ {
libTextDesc="$STR_EQUIP_DESC_BASEBALLBATNAILS"; libTextDesc=$STR_EQUIP_DESC_BASEBALLBATNAILS;
}; };
descriptionShort="$STR_EQUIP_DESC_BASEBALLBATNAILS"; descriptionShort=$STR_EQUIP_DESC_BASEBALLBATNAILS;
}; };

6
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeCrowbar.hpp
View File

@@ -21,7 +21,7 @@ class MeleeCrowbar: MeleeWeapon
{ {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_296"; text=$STR_EPOCH_PLAYER_296;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {
@@ -35,7 +35,7 @@ class MeleeCrowbar: MeleeWeapon
}; };
class Library class Library
{ {
libTextDesc="$STR_EQUIP_CROWBAR_DESC"; libTextDesc=$STR_EQUIP_CROWBAR_DESC;
}; };
descriptionShort="$STR_EQUIP_CROWBAR_DESC"; descriptionShort=$STR_EQUIP_CROWBAR_DESC;
}; };

4
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeFishingPole.hpp
View File

@@ -19,12 +19,12 @@ class MeleeFishingPole: MeleeWeapon
{ {
class Use class Use
{ {
text="$STR_EPOCH_PLAYER_297"; text=$STR_EPOCH_PLAYER_297;
script="spawn player_goFishing;"; script="spawn player_goFishing;";
}; };
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_296"; text=$STR_EPOCH_PLAYER_296;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {

8
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp
View File

@@ -6,7 +6,7 @@ class MeleeHatchet: MeleeWeapon
magazineReloadTime=0; magazineReloadTime=0;
model="\dayz_weapons\models\Hatchet_weaponized"; model="\dayz_weapons\models\Hatchet_weaponized";
picture="\dayz_equip\textures\equip_hatchet_CA.paa"; picture="\dayz_equip\textures\equip_hatchet_CA.paa";
displayName="$STR_EQUIP_NAME_41"; displayName=$STR_EQUIP_NAME_41;
droppeditem= "ItemHatchet_DZE"; droppeditem= "ItemHatchet_DZE";
magazines[]= magazines[]=
{ {
@@ -21,7 +21,7 @@ class MeleeHatchet: MeleeWeapon
{ {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_296"; text=$STR_EPOCH_PLAYER_296;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {
@@ -35,7 +35,7 @@ class MeleeHatchet: MeleeWeapon
}; };
class Library class Library
{ {
libTextDesc="$STR_EQUIP_DESC_41"; libTextDesc=$STR_EQUIP_DESC_41;
}; };
descriptionShort="$STR_EQUIP_DESC_41"; descriptionShort=$STR_EQUIP_DESC_41;
}; };

4
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeMachete.hpp
View File

@@ -21,7 +21,7 @@ class MeleeMachete: MeleeWeapon
{ {
class Toolbelt class Toolbelt
{ {
text="Add to Toolbelt"; text=$STR_EPOCH_PLAYER_296;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {
@@ -38,4 +38,4 @@ class MeleeMachete: MeleeWeapon
libTextDesc=""; libTextDesc="";
}; };
descriptionShort="An agricultural tool turned into a weapon, the Machete may be less versatile than the common hatchet, but it packs a punch."; descriptionShort="An agricultural tool turned into a weapon, the Machete may be less versatile than the common hatchet, but it packs a punch.";
}; };

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

@@ -6,7 +6,7 @@ class MeleeSledge: MeleeWeapon
magazineReloadTime=0; magazineReloadTime=0;
model="\z\addons\dayz_epoch\models\sledge_weaponized"; model="\z\addons\dayz_epoch\models\sledge_weaponized";
picture="\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; // todo icon picture="\z\addons\dayz_epoch\pictures\equip_sledge_CA.paa"; // todo icon
displayName="$STR_EQUIP_SLEDGE"; displayName=$STR_EQUIP_SLEDGE;
droppeditem= "ItemSledge"; droppeditem= "ItemSledge";
magazines[]= magazines[]=
{ {
@@ -21,7 +21,7 @@ class MeleeSledge: MeleeWeapon
{ {
class Toolbelt class Toolbelt
{ {
text="$STR_EPOCH_PLAYER_296"; text=$STR_EPOCH_PLAYER_296;
script="spawn player_addToolbelt;"; script="spawn player_addToolbelt;";
use[]= use[]=
{ {
@@ -35,7 +35,7 @@ class MeleeSledge: MeleeWeapon
}; };
class Library class Library
{ {
libTextDesc="$STR_EQUIP_CROWBAR_DESC"; libTextDesc=$STR_EQUIP_SLEDGE_DESC;
}; };
descriptionShort="$STR_EQUIP_CROWBAR_DESC"; descriptionShort=$STR_EQUIP_SLEDGE_DESC;
}; };

10
SQF/dayz_code/Configs/cfgVehicles.hpp
View File

@@ -796,7 +796,7 @@ class CfgVehicles {
class Soldier_Crew_PMC; class Soldier_Crew_PMC;
class Bandit1_DZ : Soldier_Crew_PMC { class Bandit1_DZ : Soldier_Crew_PMC {
displayName = "$STR_CHAR_2"; displayName = $STR_CHAR_2;
side = 1; side = 1;
weapons[] = {"Throw","Put"}; weapons[] = {"Throw","Put"};
model = "\dayz\characters\man_bandit"; model = "\dayz\characters\man_bandit";
@@ -811,7 +811,7 @@ class CfgVehicles {
class Bandit2_DZ: Soldier_Crew_PMC class Bandit2_DZ: Soldier_Crew_PMC
{ {
scope = 2; scope = 2;
displayName = "$STR_CHAR_2"; displayName = $STR_CHAR_2;
weapons[] = {"Throw","Put"}; weapons[] = {"Throw","Put"};
model = "\ca\characters_E\GER\GER_rifleman"; model = "\ca\characters_E\GER\GER_rifleman";
portrait = "\Ca\characters_E\data\portraits\ger_soldier_CA"; portrait = "\Ca\characters_E\data\portraits\ger_soldier_CA";
@@ -3054,7 +3054,7 @@ class CfgVehicles {
class WeaponHolder_ItemHatchet_DZE: WeaponHolderBase class WeaponHolder_ItemHatchet_DZE: WeaponHolderBase
{ {
scope = 2; scope = 2;
displayName = "$STR_EQUIP_NAME_41"; displayName = $STR_EQUIP_NAME_41;
model = "\dayz_equip\models\hatchet.p3d"; model = "\dayz_equip\models\hatchet.p3d";
class eventHandlers class eventHandlers
{ {
@@ -3088,7 +3088,7 @@ class CfgVehicles {
class WeaponHolder_ItemTentOld: WeaponHolder class WeaponHolder_ItemTentOld: WeaponHolder
{ {
scope = 2; scope = 2;
displayName = "$STR_EQUIP_NAME_20"; displayName = $STR_EQUIP_NAME_20;
class transportmagazines class transportmagazines
{ {
class _xx_ItemTentOld class _xx_ItemTentOld
@@ -3154,7 +3154,7 @@ class CfgVehicles {
class WeaponHolder_ItemJerrycanEmpty: WeaponHolderBase class WeaponHolder_ItemJerrycanEmpty: WeaponHolderBase
{ {
scope = 2; scope = 2;
displayName = "$STR_EQUIP_NAME_39"; displayName = $STR_EQUIP_NAME_39;
model = "\dayz_equip\proxy\jerrycan.p3d"; model = "\dayz_equip\proxy\jerrycan.p3d";
class eventHandlers class eventHandlers
{ {

8
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -746,7 +746,7 @@ class RscDisplayGenderSelect
class Gender_Title: RscStructuredText class Gender_Title: RscStructuredText
{ {
idc = -1; idc = -1;
text = "$STR_UI_GENDER_TITLE"; text = $STR_UI_GENDER_TITLE;
x = 0.4 * safezoneW + safezoneX; x = 0.4 * safezoneW + safezoneX;
y = 0.221864 * safezoneH + safezoneY; y = 0.221864 * safezoneH + safezoneY;
w = 0.2 * safezoneW; w = 0.2 * safezoneW;
@@ -756,7 +756,7 @@ class RscDisplayGenderSelect
class Gender_Description: RscStructuredText class Gender_Description: RscStructuredText
{ {
idc = -1; idc = -1;
text = "$STR_UI_GENDER_DESC"; text = $STR_UI_GENDER_DESC;
x = 0.4 * safezoneW + safezoneX; x = 0.4 * safezoneW + safezoneX;
y = 0.366134 * safezoneH + safezoneY; y = 0.366134 * safezoneH + safezoneY;
w = 0.2 * safezoneW; w = 0.2 * safezoneW;
@@ -834,7 +834,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay {
class CA_B_REVERT : CA_B_SAVE { class CA_B_REVERT : CA_B_SAVE {
idc = 119; idc = 119;
y = 0.2537 + 0.101903 * 1; y = 0.2537 + 0.101903 * 1;
text = "$str_disp_revert"; text = $str_disp_revert;
default = 0; default = 0;
}; };
@@ -1643,4 +1643,4 @@ class DZ_ItemInteraction {
#include "RscDisplay\RscDisplaySpawnSelecter.hpp" #include "RscDisplay\RscDisplaySpawnSelecter.hpp"
#endif #endif
#include "RscDisplay\RscMap.hpp" #include "RscDisplay\RscMap.hpp"