diff --git a/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp b/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp index fd4afccff..a206b423f 100644 --- a/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp +++ b/SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp @@ -40,6 +40,7 @@ class horde_journal_front_cover }; // buttons + class open_craft: RscIGUIShortcutButton { idc = -1; x = 0.48 * safezoneW + safezoneX; @@ -47,6 +48,16 @@ class horde_journal_front_cover text = $STR_UI_CRAFT_OPEN; action = "closeDialog 0; createDialog 'RscDisplayCraftingMenu';"; }; + /* + class open_Construction: RscIGUIShortcutButton { + idc = -1; + x = 0.48 * safezoneW + safezoneX; + y = 0.85 * safezoneH + safezoneY; + text = "Construction"; + action = "closeDialog 0; createDialog 'RscDisplayConstructionMenu';"; + }; + */ + class open_book: horde_RscButton { idc = 1900; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp index 76c5d3c54..6c943dff7 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bags.hpp @@ -20,8 +20,9 @@ class Bag_Base_EP1 : ReammoBox_EP1 { class DZ_Patrol_Pack_EP1: Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_PATROL; + scope = 2; + displayName = $STR_BACKPACK_NAME_PATROL; + descriptionShort = $STR_BACKPACK_DESC_PATROL; picture = "\ca\weapons_e\data\icons\backpack_US_ASSAULT_COYOTE_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; mapsize = 2; @@ -36,8 +37,9 @@ class DZ_Patrol_Pack_EP1: Bag_Base_EP1 class DZ_Assault_Pack_EP1: Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_ASSAULT; + scope = 2; + displayName = $STR_BACKPACK_NAME_ACU; + descriptionShort = $STR_BACKPACK_DESC_ACU; picture = "\ca\weapons_e\data\icons\backpack_US_ASSAULT_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; mapSize = 2; @@ -47,29 +49,31 @@ class DZ_Assault_Pack_EP1: Bag_Base_EP1 class eventHandlers { init="[(_this select 0),'CfgVehicles','DZ_Assault_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; - }; + }; }; class DZ_Czech_Vest_Puch: Bag_Base_EP1 { - displayname = $STR_EPOCH_PACK_POUCH; + displayname = $STR_BACKPACK_NAME_VEST; + descriptionShort = $STR_BACKPACK_DESC_VEST; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; mapsize = 2; model = "\ca\weapons_e\AmmoBoxes\backpack_acr_small.p3d"; picture = "\ca\weapons_e\data\icons\backpack_ACR_small_CA.paa"; - scope = public; + scope = 2; transportmaxmagazines = 12; transportmaxweapons = 0; class eventHandlers { init="[(_this select 0),'CfgVehicles','DZ_Czech_Vest_Puch'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; - }; + }; }; class DZ_ALICE_Pack_EP1: Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_ALICE; + scope = 2; + displayName = $STR_BACKPACK_NAME_ALICE; + descriptionShort = $STR_BACKPACK_DESC_ALICE; picture = "\ca\weapons_e\data\icons\backpack_TK_ALICE_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; mapsize = 2; @@ -79,13 +83,14 @@ class DZ_ALICE_Pack_EP1: Bag_Base_EP1 class eventHandlers { init="[(_this select 0),'CfgVehicles','DZ_ALICE_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; - }; + }; }; class DZ_TK_Assault_Pack_EP1 : Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_ACU; + scope = 2; + displayName = $STR_BACKPACK_NAME_SURVACU; + descriptionShort = $STR_BACKPACK_DESC_SURVACU; mapSize = 2; picture = "\ca\weapons_e\data\icons\backpack_CIVIL_ASSAULT_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; @@ -95,15 +100,16 @@ class DZ_TK_Assault_Pack_EP1 : Bag_Base_EP1 class eventHandlers { init="[(_this select 0),'CfgVehicles','DZ_TK_Assault_Pack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; - }; + }; }; class DZ_British_ACU : Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_BAP; + scope = 2; + displayName = $STR_BACKPACK_NAME_BRITISH; + descriptionShort = $STR_BACKPACK_DESC_BRITISH; mapSize = 2; - model = "\ca\weapons_baf\Backpack_Small_BAF";\ + model = "\ca\weapons_baf\Backpack_Small_BAF"; picture = "\ca\weapons_baf\data\UI\backpack_BAF_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; transportMaxWeapons = 3; @@ -111,13 +117,14 @@ class DZ_British_ACU : Bag_Base_EP1 class eventHandlers { init="[(_this select 0),'CfgVehicles','DZ_British_ACU'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; - }; + }; }; class DZ_CivilBackpack_EP1: Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_CZECH; + scope = 2; + displayName = $STR_BACKPACK_NAME_CZECH; + descriptionShort = $STR_BACKPACK_DESC_CZECH; picture = "\ca\weapons_e\data\icons\backpack_ACR_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; mapsize = 2; @@ -127,13 +134,14 @@ class DZ_CivilBackpack_EP1: Bag_Base_EP1 class eventHandlers { init="[(_this select 0),'CfgVehicles','DZ_CivilBackpack_EP1'] execVM '\z\addons\dayz_code\init\object_BackpackAction.sqf';"; - }; + }; }; class DZ_Backpack_EP1: Bag_Base_EP1 { - scope = public; - displayName = $STR_EPOCH_PACK_COYOTE; + scope = 2; + displayName = $STR_BACKPACK_NAME_COYOTE; + descriptionShort = $STR_BACKPACK_DESC_COYOTE; picture = "\ca\weapons_e\data\icons\backpack_US_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; mapsize = 2; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Skins.hpp b/SQF/dayz_code/Configs/CfgVehicles/Skins.hpp index e000cb869..1e0b76d25 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Skins.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Skins.hpp @@ -1,3 +1,4 @@ + class Man; class CAManBase: Man { diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp index ff62edb06..098c5768a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp @@ -1,17 +1,4 @@ -class WeaponHolderBase: ReammoBox { - scope = private; - accuracy = 1000; - vehicleClass = "Survival"; - displayName = "Weapon"; - memoryPointSupply = "collect"; - supplyRadius = 3; - transportMaxWeapons = 0; - transportMaxMagazines = 0; - transportMaxBackpacks = 0; - transportAmmo = 0; - transportRepair = 0; - transportFuel = 0; -}; +class WeaponHolderBase; class WoodenArrowF : WeaponHolderBase { scope = public; displayName = $STR_ITEMWOODENARROW_CODE_NAME; @@ -24,7 +11,7 @@ class WoodenArrowF : WeaponHolderBase { }; class WeaponHolder_ItemCrowbar: WeaponHolderBase { - scope = public; + scope=2; displayName=$STR_EQUIP_NAME_CROWBAR; model="\dayz_equip\models\crowbar.p3d"; class eventHandlers @@ -35,7 +22,7 @@ class WeaponHolder_ItemCrowbar: WeaponHolderBase /* class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase { - scope = public; + scope=2; displayName=$STR_EQUIP_NAME_BASEBALLBAT; model="\z\addons\dayz_communityassets\models\baseball_bat.p3d"; class eventHandlers @@ -45,7 +32,7 @@ class WeaponHolder_MeleeBaseBallBat: WeaponHolderBase }; class WeaponHolder_MeleeBatBarbed: WeaponHolderBase { - scope = public; + scope=2; displayName=$STR_CRAFT_NAME_BaseBallBatBarbed; model="\z\addons\dayz_communityassets\models\baseball_bat.p3d"; class eventHandlers @@ -55,7 +42,7 @@ class WeaponHolder_MeleeBatBarbed: WeaponHolderBase }; class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase { - scope = public; + scope=2; displayName=$STR_CRAFT_NAME_NailedBaseballBat; model="\z\addons\dayz_communityassets\models\baseball_bat_nails.p3d"; class eventHandlers @@ -66,7 +53,7 @@ class WeaponHolder_MeleeBaseBallBatNails: WeaponHolderBase */ class WeaponHolder_MeleeMachete: WeaponHolderBase { - scope = public; + scope=2; displayName=$STR_EQUIP_NAME_MACHETE; model="\z\addons\dayz_communityassets\models\machete.p3d"; class eventHandlers diff --git a/SQF/dayz_code/Configs/CfgVehicles/antihack_logic.hpp b/SQF/dayz_code/Configs/CfgVehicles/antihack_logic.hpp index fa0fce4ae..f493a68a5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/antihack_logic.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/antihack_logic.hpp @@ -1,43 +1,43 @@ - -//Prevent SVI hack using BattleFieldClearance & al. -class Logic; -class BattleFieldClearance: Logic -{ - vehicleClass = "Modules"; - class Eventhandlers - { - init = "if (isServer) then { diag_log(""WARNING, b4ttlefieldclearance attack from player PID#""+str(owner this)); deleteVehicle this;};"; - }; -}; -class HighCommandSubordinate: Logic -{ - vehicleClass = "Modules"; - class Eventhandlers - { - init = "if (isServer) then { diag_log(""WARNING, HighCommand5ubordinate attack from player PID#""+str(owner this)); deleteVehicle this;};"; - }; -}; -class FirstAidSystem: Logic -{ - vehicleClass = "Modules"; - class Eventhandlers - { - init = "if (isServer) then { diag_log(""WARNING, First4idSystem attack from player PID#""+str(owner this)); deleteVehicle this;};"; - }; -}; -class AlternativeInjurySimulation: Logic -{ - vehicleClass = "Modules"; - class Eventhandlers - { - init = "if (isServer) then { diag_log(""WARNING, 4lternativeInjurySimulation attack from player PID#""+str(owner this)); deleteVehicle this;};"; - }; -}; -class FunctionsManager : Logic { - vehicleClass = "Modules"; - class Eventhandlers - { - init = "diag_log format ['PRELOAD_ Functions\init %1', [_this, BIS_functions_mainscope]];if (isnil 'BIS_functions_mainscope') then { BIS_functions_mainscope = _this select 0; if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};} else {_this spawn { diag_log format ['PRELOAD_ Functions\init ERROR: deleting redundant FM! %1', [_this, (_this select 0), BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};if (isnil 'RE') then {diag_log 'MPframework inited';[] execVM '\ca\Modules\MP\data\scripts\MPframework.sqf'};"; - }; -}; + + //Prevent SVI hack using BattleFieldClearance & al. + class Logic; + class BattleFieldClearance: Logic + { + vehicleClass = "Modules"; + class Eventhandlers + { + init = "if (isServer) then { diag_log(""WARNING, b4ttlefieldclearance attack from player PID#""+str(owner this)); deleteVehicle this;};"; + }; + }; + class HighCommandSubordinate: Logic + { + vehicleClass = "Modules"; + class Eventhandlers + { + init = "if (isServer) then { diag_log(""WARNING, HighCommand5ubordinate attack from player PID#""+str(owner this)); deleteVehicle this;};"; + }; + }; + class FirstAidSystem: Logic + { + vehicleClass = "Modules"; + class Eventhandlers + { + init = "if (isServer) then { diag_log(""WARNING, First4idSystem attack from player PID#""+str(owner this)); deleteVehicle this;};"; + }; + }; + class AlternativeInjurySimulation: Logic + { + vehicleClass = "Modules"; + class Eventhandlers + { + init = "if (isServer) then { diag_log(""WARNING, 4lternativeInjurySimulation attack from player PID#""+str(owner this)); deleteVehicle this;};"; + }; + }; + class FunctionsManager : Logic { + vehicleClass = "Modules"; + class Eventhandlers + { + init = "diag_log format ['PRELOAD_ Functions\init %1', [_this, BIS_functions_mainscope]];if (isnil 'BIS_functions_mainscope') then { BIS_functions_mainscope = _this select 0; if (isServer) then {_this execVM 'ca\modules\functions\main.sqf'};} else {_this spawn { diag_log format ['PRELOAD_ Functions\init ERROR: deleting redundant FM! %1', [_this, (_this select 0), BIS_functions_mainscope]]; _mygrp = group (_this select 0); deleteVehicle (_this select 0); deleteGroup _mygrp;};};if (isnil 'RE') then {diag_log 'MPframework inited';[] execVM '\ca\Modules\MP\data\scripts\MPframework.sqf'};"; + }; + }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 4b57ab189..203b83448 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -252,7 +252,6 @@ class CfgWeapons #include "Tools\Flashlight.hpp" #include "Tools\FlashlightRed.hpp" - #include "Item\Flare.hpp" #include "Item\ItemKeyKit.hpp" #include "Item\ItemKeys.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp b/SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp deleted file mode 100644 index 5a28d0574..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Item/Flare.hpp +++ /dev/null @@ -1,36 +0,0 @@ -class Flare : GrenadeLauncher { - class ThrowMuzzle; - class MolotovCocktailMuzzle : ThrowMuzzle { - displayName = $STR_ACTION_THROW; - magazines[] = { - "TrashJackDaniels", - "ItemSodaEmpty", - "TrashTinCan", - "FoodCanGriffEmpty", - "FoodCanBadguyEmpty", - "FoodCanBoneboyEmpty", - "FoodCanCornEmpty", - "FoodCanCurgonEmpty", - "FoodCanDemonEmpty", - "FoodCanFraggleosEmpty", - "FoodCanHerpyEmpty", - "FoodCanOrlokEmpty", - "FoodCanPowellEmpty", - "FoodCanTylersEmpty", - "FoodCanUnlabeledEmpty", - "ItemSodaCokeEmpty", - "ItemSodaPepsiEmpty", - "ItemSodaMdewEmpty", - "ItemSodaMtngreenEmpty", - "ItemSodaR4z0rEmpty", - "ItemSodaClaysEmpty", - "ItemSodaSmashtEmpty", - "ItemSodaDrwasteEmpty", - "ItemSodaLemonadeEmpty", - "ItemSodaLvgEmpty", - "ItemSodaMzlyEmpty", - "ItemSodaRabbitEmpty", - "ItemTrashToiletpaper" - }; - }; - }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp b/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp index f802634e7..98b4ec839 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Loot.hpp @@ -1,55 +1,36 @@ -class Loot: Default +class Loot : Default { scope = public; value = 0; - type = 0; + type = WeaponNoSlot; displayName = "Use"; - canDrop = 0; - muzzles[] = {"this"}; - magazines[] = { - "ItemSepsisBandage", - "FoodBioMeat", - "ItemZombieParts", + canDrop = false; + muzzles[] = {this}; + modes[] = {this}; + useAction = false; + useActionTitle = ""; + enableAttack = false; + showToPlayer = false; + + //Insert here magazines to show up as "Take x" in action menu + magazines[] = + { + //medical "ItemBandage", + "ItemSepsisBandage", + "ItemPainkiller", + "ItemMorphine", + "ItemAntibiotic", "ItemHeatPack", - "PartWoodPile", - "PartFueltank", + "ItemEpinephrine" + + //vehicle parts + /*"PartFueltank", "PartWheel", "PartGeneric", "PartEngine", "PartVRotor", "PartGlass", - "ItemWaterbottle", - "ItemWaterbottleUnfilled", - "ItemEpinephrine", - "ItemGoldBar", - "ItemSilverBar", - "ItemMorphine", - "ItemBloodbag", - "ItemAntibiotic", - "ItemPainkiller", - "ItemJerrycan", - "ItemOilBarrel", - "ItemGenerator", - "ItemTent", - "ItemSandbag", - "ItemTankTrap", - "ItemWire", - "FoodSteakRaw", - "TrashTinCan", - "ItemSodaCoke", - "ItemSodaPepsi", - "ItemSodaMdew", - "FoodEdible", - "FoodBeefCooked", - "FoodCanBakedBeans", - "FoodCanSardines", - "FoodCanFrankBeans", - "FoodCanPasta" + "ItemJerrycan",*/ }; - modes[] = {"this"}; - useAction = 0; - useActionTitle = ""; - enableAttack = 0; - showToPlayer = 0; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/initintro.sqs b/SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/initintro.sqs deleted file mode 100644 index e6393a425..000000000 --- a/SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/initintro.sqs +++ /dev/null @@ -1,115 +0,0 @@ -; -; Created exclusively for ArmA2:OA - DayZMod. -; Please request permission to use/alter/distribute from project leader (R4Z0R49) AND the author (DayZDev@Skaronator.com) -; - -titleCut ["", "BLACK FADED", 0]; -showCinemaBorder false - -0 fadeMusic 0; -playMusic ["dayz_track_death_1",16]; -5 fadeMusic 0.5; - -skipTime random 9; -0 setOvercast random 0.85; - -~0.01 - "colorCorrections" ppEffectAdjust [1, 1, 0, [0.0, 0.0, 0.0, 0.0], [0.81, 0.81, 0.883, 0.6],[0.099, 0.487, 0.014, 0.0]]; "colorCorrections" ppEffectCommit 0; "colorCorrections" ppEffectEnable true; - "filmGrain" ppEffectEnable true; - "filmGrain" ppEffectAdjust [0.04, 1, 1, 0.1, 1, false]; - "filmGrain" ppEffectCommit 0; - -"radialBlur" ppEffectEnable false; -"wetDistortion" ppEffectEnable false; -"chromAberration" ppEffectEnable false; -"dynamicBlur" ppEffectEnable false; - - - -_camera = "camera" camCreate [12222.323, 3415.7791, -0.059190542] - -;##################1 - 1. Point -_camera camPrepareTarget [6433.5786, 2648.6802, 37.057621] -_camera camPrepareFOV 0.700 -_camera camCommand "intertia on" -_camera cameraEffect ["internal","back"] - -_camera camPrepareTarget [6433.5786, 2548.6802, 37.057621] -_camera camPreparePos [6703.0737, 2325.9983, 0.4] -_camera camPreload 15 -#loop - -camPreloaded _camera -_camera camCommitPrepared 0 -titleCut ["", "BLACK IN", 5]; - - -;##################1 - 2. Point -_camera camPrepareTarget [6786.1255, 2481.9768, 28.410231] -_camera camPreparePos [6681.1963, 2348.0803, 7] -_camera camPrepareFOV 0.700 -_camera camCommitPrepared 30 - -~15 - -;##################2 - 1. Point -_camera camPrepareTarget [5210.0571, 7646.0366, 9.1552734e-005] -_camera camPreparePos [5219.0688, 7613.1143, 1] -_camera camPrepareFOV 0.700 -_camera camPreload 15 -~10 -titleCut ["", "BLACK OUT", 5]; -~5 -_camera camCommitPrepared 0 -titleCut ["", "BLACK IN", 5]; - - -;##################2 - 2. Point -_camera camPrepareTarget [5210.0571, 7646.0366, 9.1552734e-005] -_camera camPreparePos [5236.7905, 7636.2803, 8.8136444] -_camera camPrepareFOV 0.700 -_camera camCommitPrepared 30 - -~15 - -;##################3 - 1. Point -_camera camPrepareTarget [4653.6475, 9595.6875, 6.1035156e-005] -_camera camPreparePos [4572.0542, 9593.2588, 4] -_camera camPrepareFOV 0.700 -_camera camPreload 15 -~10 -titleCut ["", "BLACK OUT", 5]; -~5 -_camera camCommitPrepared 0 -titleCut ["", "BLACK IN", 5]; - -;##################3 - 2. Point -_camera camPrepareTarget [4617.71, 9586.6768, 6.1035156e-005] -_camera camPreparePos [4606.9297, 9621.3691, 9.5633936] -_camera camPrepareFOV 0.700 -_camera camCommitPrepared 30 - -~15 -;##################1 - 1. Point -_camera camPrepareTarget [6433.5786, 2548.6802, 37.057621] -_camera camPreparePos [6703.0737, 2325.9983, 0.4] -_camera camPreload 15 -~10 -5 fadeMusic 0 -titleCut ["", "BLACK OUT", 5]; -~5 - - -skipTime random -2; -0 setOvercast random 0.5; - - -titleCut ["", "BLACK FADED", 0]; -goto "loop" - -;exit -player cameraEffect ["terminate","back"] -_this switchMove "" -camDestroy _camera -exit - diff --git a/SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/mission.sqm b/SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/mission.sqm deleted file mode 100644 index fff5c65a6..000000000 --- a/SQF/dayz_code/Configs/CfgWorlds/intro.Chernarus/mission.sqm +++ /dev/null @@ -1,1422 +0,0 @@ -/* - Created exclusively for ArmA2:OA - DayZMod. - Please request permission to use/alter/distribute from project leader (R4Z0R49) AND the author (DayZDev@Skaronator.com) -*/ - -version=11; -class Mission -{ - addOns[]= - { - "chernarus", - "ca_animals2_dogs_pastor", - "cawheeled2_kamaz", - "ca_animals2_rabbit", - "cacharacters2" - }; - addOnsAuto[]= - { - "cacharacters2", - "chernarus" - }; - randomSeed=2943491; - class Intel - { - startWeather=0.091034003; - forecastWeather=1; - year=2008; - month=4; - day=11; - hour=5; - minute=45; - }; - class Groups - { - items=1; - class Item0 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6143.9302,192.78458,4790.5137}; - azimut=393.15283; - id=0; - side="CIV"; - vehicle="Citizen1"; - player="PLAYER COMMANDER"; - leader=1; - skill=0.60000002; - }; - }; - }; - }; -}; -class Intro -{ - addOns[]= - { - "chernarus", - "cacharacters", - "ca_animals2_rabbit", - "CAWheeled3_TT650", - "cacharacters2", - "ca_missions_garbagecollector", - "ca_modules_functions", - "ca_animals2_wildboar", - "ca_animals2_dogs_pastor", - "ca_animals2_chicken", - "ca_animals2_cow", - "CAWheeled", - "cadata", - "ca_animals2_sheep", - "dayz_code", - "dayz", - "caair2_uh1y" - }; - addOnsAuto[]= - { - "cacharacters2", - "dayz_code", - "caair2_uh1y", - "chernarus" - }; - randomSeed=4682243; - class Intel - { - startWeather=0.40802503; - startFog=0.29748401; - forecastWeather=0.23246098; - year=2008; - month=8; - day=11; - }; - class Groups - { - items=31; - class Item0 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6736.4092,227.08838,4421.9854}; - azimut=274.55042; - id=0; - side="CIV"; - vehicle="Woodlander2"; - player="PLAYER COMMANDER"; - leader=1; - skill=0.60000002; - init="this exec ""initintro.sqs"""; - }; - }; - }; - class Item1 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6675.1235,6,2339.3838}; - azimut=24.345699; - id=1; - side="CIV"; - vehicle="z_villager3"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=3; - class Item0 - { - position[]={6682.8101,6,2347.4487}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6708.145,6,2318.0676}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={6679.7603,6,2341.7258}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item2 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6693.7329,6,2358.8093}; - azimut=-133.942; - id=2; - side="CIV"; - vehicle="zZombie_new_Base"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6666.7578,6,2331.3977}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6716.623,6,2379.6531}; - type="CYCLE"; - class Effects - { - }; - }; - }; - }; - class Item3 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6637.0332,6,2369.8806}; - azimut=141.49699; - id=3; - side="CIV"; - vehicle="z_suit1"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=3; - class Item0 - { - position[]={6645.0059,6,2380.791}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6691.8701,6,2336.4238}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={6647.7163,6,2377.937}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item4 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6709.0303,6,2322.772}; - azimut=284.06299; - id=4; - side="CIV"; - vehicle="zZombie_new_Base"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=3; - class Item0 - { - position[]={6647.1709,6,2384.6587}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6587.7329,6,2437.533}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={6705.3755,6,2326.4246}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item5 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6741.3462,6,2395.4888}; - azimut=284.06299; - id=5; - side="CIV"; - vehicle="z_hunter"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6690.8257,6,2449.1711}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6728.6138,6,2416.5178}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item6 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6703.7686,6,2371.8694}; - azimut=393.6929; - id=6; - side="CIV"; - vehicle="z_villager2"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6716.9302,6,2409.6799}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6716.6411,6,2386.5417}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item7 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6720.1563,6,2390.9443}; - azimut=405.827; - id=7; - side="CIV"; - vehicle="z_hunter"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6786.4521,6,2462.6267}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6735.5781,6,2402.9065}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item8 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6777.5347,6,2433.9968}; - azimut=284.06299; - id=8; - side="CIV"; - vehicle="z_hunter"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6758.0396,6,2476.0161}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6787.519,6,2438.908}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item9 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6677.4868,6,2355.9971}; - azimut=284.06299; - id=9; - side="CIV"; - vehicle="z_villager1"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=1; - class Item0 - { - position[]={6591.521,6,2427.9751}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item10 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6821.791,6,2499.2332}; - azimut=284.06299; - id=10; - side="CIV"; - vehicle="z_worker2"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6785.9995,6,2423.7241}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6827.2656,6,2456.4971}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item11 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6810.7334,6.1020002,2498.96}; - azimut=284.06299; - id=11; - side="CIV"; - vehicle="z_villager3"; - leader=1; - skill=1; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6826.5313,6,2496.5698}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6796.2222,6,2466.8259}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item12 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6652.2007,6,2369.1816}; - id=12; - side="CIV"; - vehicle="z_worker3"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6688.3955,6.1019988,2364.1038}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6667.5112,6,2356.4702}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item13 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6797.8003,6,2471.2327}; - id=13; - side="CIV"; - vehicle="z_worker2"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=1; - class Item0 - { - position[]={6756.2114,6,2426.5327}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item14 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6861.3774,6,2527.9368}; - id=14; - side="CIV"; - vehicle="z_villager2"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6823.3296,6,2563.1021}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6865.8682,6,2515.384}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item15 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={6742.6021,6,2410.71}; - id=15; - side="CIV"; - vehicle="z_worker1"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={6778.4253,6,2464.2666}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={6746.3228,6,2416.5281}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item16 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={5207.4028,333.79437,7622.3882}; - id=19; - side="CIV"; - vehicle="z_soldier_pilot"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={5178.5674,334.58252,7670.7803}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={5227.3052,329.73154,7657.751}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item17 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={5206.0322,333.48984,7629.2871}; - id=18; - side="CIV"; - vehicle="z_soldier_pilot"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={5200.2441,332.12897,7663.7847}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={5220.8403,330.66727,7646.7876}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item18 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={5204.2393,331.73276,7662.8403}; - azimut=-173.96866; - id=16; - side="CIV"; - vehicle="z_soldier_pilot"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={5224.8271,330.79904,7635.541}; - speed="LIMITED"; - class Effects - { - }; - }; - class Item1 - { - position[]={5177.4336,336.39441,7649.1157}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item19 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={5211.0615,333.18628,7624.001}; - id=17; - side="CIV"; - vehicle="z_soldier_pilot"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={5221.5635,330.22226,7657.7021}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={5223.708,331.48358,7625.77}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item20 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={5218.3164,331.83609,7630.3311}; - id=20; - side="CIV"; - vehicle="z_soldier_pilot"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={5174.0425,338.40155,7628.04}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={5214.7212,330.63126,7666.3105}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item21 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={5189.2949,333.11401,7671.0923}; - azimut=140.44858; - id=21; - side="CIV"; - vehicle="z_soldier_pilot"; - leader=1; - skill=0.60000002; - synchronizations[]={21}; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={5215.7144,332.49414,7625.2495}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={5204.6304,331.35416,7675.2217}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item22 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4600.0322,338.9549,9611.1768}; - id=30; - side="CIV"; - vehicle="zZombie_new_Base"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=3; - class Item0 - { - position[]={4620.8369,338.94299,9581.54}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4635.4253,339,9604.4512}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={4593.7534,338.95172,9601.2783}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item23 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4604.3633,338.95001,9605.8457}; - azimut=-113.584; - id=22; - side="CIV"; - vehicle="z_villager2"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=4; - class Item0 - { - position[]={4573.2026,339.01917,9592.7744}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4568.002,339.07465,9599.1836}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={4570.105,339.05222,9590.0674}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item3 - { - position[]={4596.5513,338.95001,9599.3535}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item24 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4615.1289,338.93723,9580.209}; - id=23; - side="CIV"; - vehicle="zZombie_new_Base"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={4610.2441,338.953,9610.4141}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4612.7188,338.9198,9574.8779}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item25 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4643.1641,338.99911,9601.1494}; - id=24; - side="CIV"; - vehicle="z_villager3"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=4; - class Item0 - { - position[]={4653.0586,338.99161,9606.291}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4678.3667,338.98999,9601.6582}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={4671.3257,339.00397,9583.1934}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item3 - { - position[]={4637.0752,338.98785,9588.5859}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item26 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4654.2002,339.01559,9579.2568}; - azimut=55; - id=25; - side="CIV"; - vehicle="z_soldier_heavy"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=3; - class Item0 - { - position[]={4628.8291,338.98376,9593.9805}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4599.9063,338.95001,9604.7061}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={4643.2905,339.00107,9584.333}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item27 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4616.7139,338.95935,9592.0107}; - id=26; - side="CIV"; - vehicle="z_villager1"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=3; - class Item0 - { - position[]={4583.7319,338.95999,9608.3213}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4601.8721,338.95938,9614.541}; - class Effects - { - }; - showWP="NEVER"; - }; - class Item2 - { - position[]={4616.4604,338.95999,9595.123}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item28 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4623.8179,338.99677,9605.085}; - id=27; - side="CIV"; - vehicle="z_villager2"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={4601.1743,338.95001,9597.9141}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4621.9941,338.95151,9584.1191}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item29 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4652.6494,339.01355,9575.4443}; - id=28; - side="CIV"; - vehicle="z_villager3"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={4641.4507,338.99039,9592.2021}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4643.8618,338.98593,9566.4395}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - class Item30 - { - side="CIV"; - class Vehicles - { - items=1; - class Item0 - { - position[]={4611.2588,338.95685,9591.377}; - id=29; - side="CIV"; - vehicle="zZombie_new_Base"; - leader=1; - skill=0.60000002; - }; - }; - class Waypoints - { - items=2; - class Item0 - { - position[]={4614.9385,338.96576,9607.3701}; - speed="LIMITED"; - class Effects - { - }; - showWP="NEVER"; - }; - class Item1 - { - position[]={4625.9751,338.97263,9591.252}; - type="CYCLE"; - class Effects - { - }; - showWP="NEVER"; - }; - }; - }; - }; - class Vehicles - { - items=1; - class Item0 - { - position[]={5205.9297,332.242,7647.9438}; - id=31; - side="EMPTY"; - vehicle="UH1Wreck"; - skill=0.60000002; - }; - }; -}; -class OutroWin -{ - addOns[]= - { - "chernarus" - }; - addOnsAuto[]= - { - "chernarus" - }; - randomSeed=1623043; - class Intel - { - startWeather=0.25; - forecastWeather=0.25; - year=2008; - month=10; - day=11; - hour=9; - minute=20; - }; -}; -class OutroLoose -{ - addOns[]= - { - "chernarus" - }; - addOnsAuto[]= - { - "chernarus" - }; - randomSeed=8674307; - class Intel - { - startWeather=0.25; - forecastWeather=0.25; - year=2008; - month=10; - day=11; - hour=9; - minute=20; - }; -}; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp b/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp index 048bcbf35..0b133099d 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp @@ -1,9 +1,13 @@ -class RscDisplayGear { +class RscDisplayGear +{ idd = 106; enableDisplay = 1; movingEnable = 0; - onLoad = "setMousePosition [0.5, 0.5];_this call fn_gearMenuChecks;[] spawn object_monitorGear; {player removeMagazines _x} forEach MeleeMagazines; call gear_ui_init; call ui_gear_sound; if (isNil('IGUI_GEAR_activeFilter')) then { IGUI_GEAR_activeFilter = 0;}; private ['_dummy']; _dummy = [_this,'initDialog'] call compile preprocessFile '\z\addons\dayz_code\system\handleGear.sqf'; _dummy = [_this,'onLoad'] execVM '\z\addons\dayz_code\system\handleGear.sqf'; _dummy;"; - onUnload = "{player removeMagazines _x} forEach MeleeMagazines; call player_forceSave; call dayz_meleeMagazineCheck;"; + + //onLoad = "[] spawn object_monitorGear; {player removeMagazines _x} count MeleeMagazines; call gear_ui_init; call ui_gear_sound; if (isNil('IGUI_GEAR_activeFilter')) then { IGUI_GEAR_activeFilter = 0;}; [_this,'onLoad'] execVM '\z\addons\dayz_code\system\handleGear.sqf'";/* diag_log 'RscDisplayGear : : onLoad'; */ + //onUnload = "{player removeMagazines _x} count MeleeMagazines; call player_forceSave; call dayz_meleeMagazineCheck;"; /* diag_log 'RscDisplayGear : : onunLoad'; */ + onLoad = "setMousePosition [0.5, 0.5];_this call fn_gearMenuChecks; false call dz_fn_meleeMagazines; [] spawn object_monitorGear; call gear_ui_init; call ui_gear_sound; if (isNil 'IGUI_GEAR_activeFilter') then {IGUI_GEAR_activeFilter = 0}; [_this, 'onLoad'] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; + onUnload = "true call dz_fn_meleeMagazines; call player_forceSave;"; onMouseMoving = "[] call gear_ui_hide;"; onMouseHolding = "[] call gear_ui_hide;"; @@ -14,11 +18,12 @@ class RscDisplayGear { emptyMag2 = ""; emptyHGun = ""; emptyHGunMag = ""; - - - class Controls { + + class Controls + { // Cannot be removed due to crash or something is dependend on it - class CA_Filter_Icon: RscPicture { + class CA_Filter_Icon : RscPicture + { idc = 148; style = "0x30 + 0x800"; x = 0; @@ -27,9 +32,10 @@ class RscDisplayGear { h = 0; text = "\ca\ui\data\igui_gear_filter_1_ca.paa"; }; - + // Cannot be removed due to crash or something is dependend on it - class CA_Filter_Left_Icon: RscPicture { + class CA_Filter_Left_Icon : RscPicture + { idc = 1301; style = "0x30 + 0x800"; x = 0; @@ -38,9 +44,10 @@ class RscDisplayGear { h = 0; text = "\ca\ui\data\arrow_left_ca.paa"; }; - + // Cannot be removed due to crash or something is dependend on it - class CA_Filter_Right_Icon: RscPicture { + class CA_Filter_Right_Icon : RscPicture + { idc = 1302; style = "0x30 + 0x800"; x = 0; @@ -49,9 +56,10 @@ class RscDisplayGear { h = 0; text = "\ca\ui\data\arrow_right_ca.paa"; }; - + // Cannot be removed due to crash or something is dependend on it - class CA_Filter_Arrow_Left: RscButton { + class CA_Filter_Arrow_Left : RscButton + { idc = 150; colorText[] = {1,1,1,0}; colorDisabled[] = {1,1,1,0}; @@ -66,9 +74,10 @@ class RscDisplayGear { h = 0; text = ""; }; - + // Cannot be removed due to crash or something is dependend on it - class CA_Filter_Arrow_Right: RscButton { + class CA_Filter_Arrow_Right : RscButton + { idc = 151; colorText[] = {1,1,1,0}; colorDisabled[] = {1,1,1,0}; @@ -83,9 +92,10 @@ class RscDisplayGear { h = 0; text = ""; }; - + // Cannot be removed due to crash or something is dependent on it - class CA_Filter_Icon1: RscButton { + class CA_Filter_Icon1 : RscButton + { idc = 149; colorText[] = {1,1,1,0}; colorDisabled[] = {1,1,1,0}; @@ -100,8 +110,9 @@ class RscDisplayGear { h = 0; text = ""; }; - - class Gear_Title: RscText { + + class Gear_Title : RscText + { idc = 1001; text = $STR_UI_SLOTS_LEFT; x = -0.051; @@ -111,9 +122,10 @@ class RscDisplayGear { colorText[] = {0.06,0.05,0.03,1}; shadow = 0; }; - + // Cannot be removed due to crash or something is dependent on it - class Unit_Title: RscText { + class Unit_Title : RscText + { idc = 101; style = 2; x = 0; @@ -121,9 +133,10 @@ class RscDisplayGear { w = 0; h = 0; }; - + // Cannot be removed due to crash or something is dependent on it - class CA_Money: RscText { + class CA_Money : RscText + { idc = 1102; style = 1; show = 0; @@ -133,9 +146,10 @@ class RscDisplayGear { h = 0; text = "Money:"; }; - + // Cannot be removed due to crash or something is dependent on it - class CA_Money_Value: RscText { + class CA_Money_Value : RscText + { idc = 1103; x = 0; y = 0; @@ -143,8 +157,9 @@ class RscDisplayGear { h = 0; text = "0"; }; - - class Weapon_slots_picture: RscPicture { + + class Weapon_slots_picture : RscPicture + { idc = 9001; x = 0.084; y = 0.01; @@ -152,9 +167,9 @@ class RscDisplayGear { h = 0.042; text = "\z\addons\dayz_code\gui\gear\gear_ui_slots_weapons.paa"; }; - - - class Weapon_slots_value: RscText { + + class Weapon_slots_value : RscText + { idc = 9002; x = 0.104; y = 0.014; @@ -164,8 +179,9 @@ class RscDisplayGear { shadow = 0; text = "n/a"; }; - - class Item_slots_picture: RscPicture { + + class Item_slots_picture : RscPicture + { idc = 9003; x = 0.167; y = 0.01; @@ -173,8 +189,9 @@ class RscDisplayGear { h = 0.042; text = "\z\addons\dayz_code\gui\gear\gear_ui_slots_items.paa"; }; - - class Item_slots_value: RscText { + + class Item_slots_value : RscText + { idc = 9004; x = 0.187; y = 0.014; @@ -184,8 +201,9 @@ class RscDisplayGear { shadow = 0; text = "n/a"; }; - - class Backpack_slots_picture: RscPicture { + + class Backpack_slots_picture : RscPicture + { idc = 9005; x = 0.254; y = 0.01; @@ -193,9 +211,9 @@ class RscDisplayGear { h = 0.042; text = "\z\addons\dayz_code\gui\gear\gear_ui_slots_backpacks.paa"; }; - - - class Backpack_slots_value: RscText { + + class Backpack_slots_value : RscText + { idc = 9006; x = 0.274; y = 0.014; @@ -205,8 +223,9 @@ class RscDisplayGear { shadow = 0; text = "n/a"; }; - - class Available_items_Text: RscText { + + class Available_items_Text : RscText + { idc = 156; x = -0.051; y = 0.054; @@ -215,8 +234,9 @@ class RscDisplayGear { colorText[] = {0.06,0.05,0.03,0.6}; shadow = 0; }; - - class CA_ItemName: RscText { + + class CA_ItemName : RscText + { idc = 1101; //x = -0.039; x = -0.051; @@ -226,8 +246,9 @@ class RscDisplayGear { shadow = 0; text = "Gear of the unit:"; }; - - class CA_CustomDescription: RscStructuredText { + + class CA_CustomDescription : RscStructuredText + { idc = 1106; //x = -0.039; x = -0.051; @@ -237,15 +258,18 @@ class RscDisplayGear { h = 0.152; colorText[] = {0.14,0.14,0.14,1}; shadow = 0; - class Attributes { + + class Attributes + { font = "Zeppelin32"; color = "#232323"; align = "left"; shadow = 0; }; }; - - class CA_Item_Picture: RscPicture { + + class CA_Item_Picture : RscPicture + { idc = 1104; style = "0x30 + 0x800"; //x = 0.331; @@ -258,39 +282,45 @@ class RscDisplayGear { h = 0.155; text = ""; }; - - class ListboxArrows: RscControlsGroup { + + class ListboxArrows : RscControlsGroup + { x = -0.058; y = 0.122; w = 0.507; //w = 0.556; h = 0.523; idc = 155; - - class VScrollbar { + + class VScrollbar + { autoScrollSpeed = -1; autoScrollDelay = 5; autoScrollRewind = 0; color[] = {1,1,1,0}; width = 0.001; }; - - class HScrollbar { + + class HScrollbar + { color[] = {1,1,1,0}; height = 0.001; }; - - class Controls { - class CA_B_Add: RscGearShortcutButton { + + class Controls + { + class CA_B_Add : RscGearShortcutButton + { idc = 146; x = -2; style = 2048; - onSetFocus = "private [""_dummy""]; _dummy = [_this,""onFocus""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; - onButtonClick = "private [""_dummy""]; {player removeMagazines _x} forEach MeleeMagazines; _dummy = [_this,""onLBListSelChanged""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; + onSetFocus = "[_this,'onFocus'] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; + onButtonClick = "{player removeMagazines _x} count MeleeMagazines; [_this,'onLBListSelChanged'] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; text = "<"; }; - - class Available_items: RscIGUIListNBox { + + class Available_items : RscIGUIListNBox + { idc = 105; columns[] = {0.07804,0.18412,0.81,0.67}; drawSideArrows = 1; @@ -302,10 +332,9 @@ class RscDisplayGear { colorSelectBackground[] = {0.28,0.25,0.18,0.4}; colorSelectBackground2[] = {0.28,0.25,0.18,0.4}; shadow = 0; - onKeyDown = "private [""_dummy""]; _dummy = [_this,""onKeyDown"",0,107,0,107] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; - onLBSelChanged = "private [""_dummy""]; _dummy = [_this,""onLBSelChanged""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; - onLBListSelChanged = "private [""_dummy""]; _dummy = [_this,""onLBListSelChanged""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; - onKillFocus = "private [""_dummy""]; _dummy = [_this,""onKillFocus""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; + onLBSelChanged = "[_this,'onLBSelChanged'] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; + onLBListSelChanged = "[_this,'onLBListSelChanged'] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; + onKillFocus = "[_this,'onKillFocus'] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; x = 0; y = 0; //w = 0.46; @@ -315,103 +344,118 @@ class RscDisplayGear { h = 0.523; canDrag = 1; }; - - class CA_B_Remove: CA_B_Add { + + class CA_B_Remove : CA_B_Add + { idc = 147; x = -2; - onSetFocus = "private [""_dummy""]; _dummy = [_this,""onFocus""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; - onButtonClick = "private [""_dummy""]; {player removeMagazines _x} forEach MeleeMagazines; _dummy = [_this,""onLBListSelChanged""] execVM ""\z\addons\dayz_code\system\handleGear.sqf""; _dummy;"; + onSetFocus = "[_this,""onFocus""] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; + onButtonClick = "{player removeMagazines _x} count MeleeMagazines; [_this,""onLBListSelChanged""] execVM '\z\addons\dayz_code\system\handleGear.sqf'"; text = ">"; }; }; }; - - class G_Interaction: RscControlsGroup { + + class G_Interaction : RscControlsGroup + { idc = 6902; x = 0.502; y = 0.250 * safezoneH; w = 0.145 * safezoneW; h = 0; //0.250 * safezoneH; onMouseMoving = "call gear_ui_offMenu;"; - - class VScrollbar { + + class VScrollbar + { autoScrollSpeed = -1; autoScrollDelay = 5; autoScrollRewind = 0; color[] = {1,1,1,0}; width = 0.001; }; - - class HScrollbar { + + class HScrollbar + { color[] = {1,1,1,0}; height = 0.001; }; - - class Controls { - class RscButton_1600: RscButtonActionMenu { + + class Controls + { + class RscButton_1600 : RscButtonActionMenu + { idc = 1600; text = ""; x = 0; y = 0 * safezoneH; }; - - class RscButton_1601: RscButtonActionMenu { + + class RscButton_1601 : RscButtonActionMenu + { idc = 1601; text = ""; x = 0; y = 0.025 * safezoneH; }; - - class RscButton_1602: RscButtonActionMenu { + + class RscButton_1602 : RscButtonActionMenu + { idc = 1602; text = ""; x = 0; y = 0.05 * safezoneH; }; - - class RscButton_1603: RscButtonActionMenu { + + class RscButton_1603 : RscButtonActionMenu + { idc = 1603; text = ""; x = 0; y = 0.075 * safezoneH; }; - - class RscButton_1604: RscButtonActionMenu { + + class RscButton_1604 : RscButtonActionMenu + { idc = 1604; text = ""; x = 0; y = 0.1 * safezoneH; }; - - class RscButton_1605: RscButtonActionMenu { + + class RscButton_1605 : RscButtonActionMenu + { idc = 1605; text = ""; x = 0; y = 0.125 * safezoneH; }; - - class RscButton_1606: RscButtonActionMenu { + + class RscButton_1606 : RscButtonActionMenu + { idc = 1606; text = ""; x = 0; y = 0.15 * safezoneH; }; - - class RscButton_1607: RscButtonActionMenu { + + class RscButton_1607 : RscButtonActionMenu + { idc = 1607; text = ""; x = 0; y = 0.175 * safezoneH; }; - - class RscButton_1608: RscButtonActionMenu { + + class RscButton_1608 : RscButtonActionMenu + { idc = 1608; text = ""; x = 0; y = 0.2 * safezoneH; }; - - class RscButton_1609: RscButtonActionMenu { + + class RscButton_1609 : RscButtonActionMenu + { idc = 1609; text = ""; x = 0; @@ -419,29 +463,34 @@ class RscDisplayGear { }; }; }; - - class G_GearItems: RscControlsGroup { + + class G_GearItems : RscControlsGroup + { idc = 160; x = 0.465; y = 0.104; w = 0.533; h = 0.928; - - class VScrollbar { + + class VScrollbar + { autoScrollSpeed = -1; autoScrollDelay = 5; autoScrollRewind = 0; color[] = {1,1,1,0}; width = 0.001; }; - - class HScrollbar { + + class HScrollbar + { color[] = {1,1,1,0}; height = 0.001; }; - - class Controls { - class CA_Gear_slot_primary: RscActiveText { + + class Controls + { + class CA_Gear_slot_primary : RscActiveText + { idc = 107; x = 0.138; y = 0.181; @@ -456,8 +505,9 @@ class RscDisplayGear { colorFocused[] = {0,0,0,0}; canDrag = 1; }; - - class CA_Gear_slot_secondary: CA_Gear_slot_primary { + + class CA_Gear_slot_secondary : CA_Gear_slot_primary + { idc = 108; x = 0.138; y = 0; @@ -467,8 +517,9 @@ class RscDisplayGear { colorBackgroundSelected[] = {0.27,0.34,0.47,0.8}; onMouseButtonDblClick = "if (!(ctrlShown ((findDisplay 106) displayCtrl 158)) && ((gearSlotData (_this select 0)) isKindOf 'Bag_Base_EP1')) then { [player,'open_backpack',0,false,5] call dayz_zombieSpeak; };"; }; - - class CA_Gear_slot_carry: CA_Gear_slot_primary { + + class CA_Gear_slot_carry : CA_Gear_slot_primary + { idc = 1209; x = 0.138; y = 0.364; @@ -480,104 +531,117 @@ class RscDisplayGear { colorBackground[] = {0.74,0.74,0.74,0.2}; // has no effect colorBackgroundSelected[] = {0.74,0.74,0.74,0.8}; // has no effect }; - - class CA_Gear_slot_item1: CA_Gear_slot_primary { + + class CA_Gear_slot_item1 : CA_Gear_slot_primary + { idc = 109; x = 0; y = 0; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item2: CA_Gear_slot_item1 { + + class CA_Gear_slot_item2 : CA_Gear_slot_item1 + { idc = 110; x = 0.069; y = 0; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item3: CA_Gear_slot_item1 { + + class CA_Gear_slot_item3 : CA_Gear_slot_item1 + { idc = 111; x = 0; y = 0.091; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item4: CA_Gear_slot_item1 { + + class CA_Gear_slot_item4 : CA_Gear_slot_item1 + { idc = 112; x = 0.069; y = 0.091; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item5: CA_Gear_slot_item1 { + + class CA_Gear_slot_item5 : CA_Gear_slot_item1 + { idc = 113; x = 0; y = 0.181; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item6: CA_Gear_slot_item1 { + + class CA_Gear_slot_item6 : CA_Gear_slot_item1 + { idc = 114; x = 0.069; y = 0.181; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item7: CA_Gear_slot_item1 { + + class CA_Gear_slot_item7 : CA_Gear_slot_item1 + { idc = 115; x = 0; y = 0.272; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item8: CA_Gear_slot_item1 { + + class CA_Gear_slot_item8 : CA_Gear_slot_item1 + { idc = 116; x = 0.069; y = 0.272; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item9: CA_Gear_slot_item1 { + + class CA_Gear_slot_item9 : CA_Gear_slot_item1 + { idc = 117; x = 0; y = 0.364; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item10: CA_Gear_slot_item1 { + + class CA_Gear_slot_item10 : CA_Gear_slot_item1 + { idc = 118; x = 0.069; y = 0.364; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item11: CA_Gear_slot_item1 { + + class CA_Gear_slot_item11 : CA_Gear_slot_item1 + { idc = 119; x = 0; y = 0.457; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_item12: CA_Gear_slot_item1 { + + class CA_Gear_slot_item12 : CA_Gear_slot_item1 + { idc = 120; x = 0.069; y = 0.457; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun: CA_Gear_slot_primary { + + class CA_Gear_slot_handgun : CA_Gear_slot_primary + { idc = 121; x = 0; y = 0.559; @@ -586,8 +650,9 @@ class RscDisplayGear { colorBackground[] = {0.5,0.58,0.38,0.2}; colorBackgroundSelected[] = {0.5,0.58,0.38,0.8}; }; - - class CA_Gear_slot_handgun_item1: CA_Gear_slot_item1 { + + class CA_Gear_slot_handgun_item1 : CA_Gear_slot_item1 + { idc = 122; x = 0.138; y = 0.559; @@ -596,64 +661,72 @@ class RscDisplayGear { colorBackground[] = {0.69,0.86,0.38,0.2}; colorBackgroundSelected[] = {0.5,0.58,0.38,0.8}; }; - - class CA_Gear_slot_handgun_item2: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item2 : CA_Gear_slot_handgun_item1 + { idc = 123; x = 0.207; y = 0.559; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun_item3: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item3 : CA_Gear_slot_handgun_item1 + { idc = 124; x = 0.275; y = 0.559; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun_item4: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item4 : CA_Gear_slot_handgun_item1 + { idc = 125; x = 0.345; y = 0.559; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun_item5: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item5 : CA_Gear_slot_handgun_item1 + { idc = 126; x = 0.138; y = 0.65; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun_item6: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item6 : CA_Gear_slot_handgun_item1 + { idc = 127; x = 0.207; y = 0.65; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun_item7: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item7 : CA_Gear_slot_handgun_item1 + { idc = 128; x = 0.275; y = 0.65; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_handgun_item8: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_handgun_item8 : CA_Gear_slot_handgun_item1 + { idc = 129; x = 0.345; y = 0.65; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory1: CA_Gear_slot_handgun_item1 { + + class CA_Gear_slot_inventory1 : CA_Gear_slot_handgun_item1 + { idc = 134; x = 0; y = 0.752; @@ -662,96 +735,108 @@ class RscDisplayGear { colorBackground[] = {0.88,0.8,0.66,0.2}; colorBackgroundSelected[] = {0.49,0.43,0.29,0.8}; }; - - class CA_Gear_slot_inventory2: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory2 : CA_Gear_slot_inventory1 + { idc = 135; x = 0.069; y = 0.752; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory3: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory3 : CA_Gear_slot_inventory1 + { idc = 136; x = 0.138; y = 0.752; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory4: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory4 : CA_Gear_slot_inventory1 + { idc = 137; x = 0.207; y = 0.752; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory5: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory5 : CA_Gear_slot_inventory1 + { idc = 138; x = 0.275; y = 0.752; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory6: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory6 : CA_Gear_slot_inventory1 + { idc = 139; x = 0.345; y = 0.752; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory7: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory7 : CA_Gear_slot_inventory1 + { idc = 140; x = 0; y = 0.844; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory8: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory8 : CA_Gear_slot_inventory1 + { idc = 141; x = 0.069; y = 0.844; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory9: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory9 : CA_Gear_slot_inventory1 + { idc = 142; x = 0.138; y = 0.844; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory10: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory10 : CA_Gear_slot_inventory1 + { idc = 143; x = 0.207; y = 0.844; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory11: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory11 : CA_Gear_slot_inventory1 + { idc = 144; x = 0.275; y = 0.844; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_inventory12: CA_Gear_slot_inventory1 { + + class CA_Gear_slot_inventory12 : CA_Gear_slot_inventory1 + { idc = 145; x = 0.345; y = 0.844; w = 0.064; h = 0.085; }; - - class CA_Gear_slot_special1: CA_Gear_slot_handgun { + + class CA_Gear_slot_special1 : CA_Gear_slot_handgun + { idc = 130; x = 0.413; y = 0.568; @@ -760,16 +845,18 @@ class RscDisplayGear { colorBackground[] = {0.46,0.46,0.4,0.2}; colorBackgroundSelected[] = {0.46,0.46,0.4,0.8}; }; - - class CA_Gear_slot_special2: CA_Gear_slot_special1 { + + class CA_Gear_slot_special2 : CA_Gear_slot_special1 + { idc = 131; x = 0.413; y = 0.757; w = 0.12; h = 0.16; }; - - class ButtonRearm: RscActiveText { + + class ButtonRearm : RscActiveText + { idc = 132; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_open.paa"; @@ -782,8 +869,9 @@ class RscDisplayGear { color[] = {1,1,1,0.5}; colorActive[] = {1,1,1,0.5}; }; - - class ButtonOpenBag: RscActiveText { + + class ButtonOpenBag : RscActiveText + { idc = 157; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_open.paa"; @@ -797,8 +885,9 @@ class RscDisplayGear { colorActive[] = {1,1,1,0.8}; action = "[player,'open_backpack',0,false,5] call dayz_zombieSpeak;"; }; - - class ButtonCloseBag: RscActiveText { + + class ButtonCloseBag : RscActiveText + { idc = 158; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_open.paa"; @@ -812,8 +901,9 @@ class RscDisplayGear { colorActive[] = {1,1,1,0.8}; action = "[player,'open_backpack',0,false,5] call dayz_zombieSpeak;"; }; - - class Button1: RscActiveText { + + class Button1 : RscActiveText + { idc = 1204; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_carry.paa"; @@ -827,8 +917,9 @@ class RscDisplayGear { colorActive[] = {1,1,1,0.8}; action = "0 call dz_fn_switchWeapon"; }; - - class Button2: RscActiveText { + + class Button2 : RscActiveText + { idc = 1208; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_hold.paa"; @@ -844,8 +935,9 @@ class RscDisplayGear { }; }; }; - - class BagItemsGroup: RscControlsGroup { + + class BagItemsGroup : RscControlsGroup + { x = 0.465; y = 0.104; w = 0.533; @@ -866,21 +958,24 @@ class RscDisplayGear { colorFocused[] = {1,1,1,1}; soundClick[] = {"",0.1,1}; soundDoubleClick[] = {"",0.1,1}; - - class VScrollbar { + + class VScrollbar + { autoScrollSpeed = -1; autoScrollDelay = 5; autoScrollRewind = 0; color[] = {1,1,1,0}; width = 0.001; }; - - class HScrollbar { + + class HScrollbar + { color[] = {1,1,1,0}; height = 0.001; }; - - class ScrollBar { + + class ScrollBar + { color[] = {1,1,1,0.6}; colorActive[] = {1,1,1,1}; colorDisabled[] = {1,1,1,0.3}; @@ -889,9 +984,11 @@ class RscDisplayGear { arrowEmpty = "\ca\ui\data\ui_arrow_top_ca.paa"; border = "\ca\ui\data\ui_border_scroll_ca.paa"; }; - - class Controls { - class ButtonCloseBagCustom: RscActiveText { + + class Controls + { + class ButtonCloseBagCustom : RscActiveText + { idc = 1203; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_open.paa"; @@ -907,9 +1004,10 @@ class RscDisplayGear { }; }; }; - + // Cannot be removed due to crash or something is dependend on it - class ButtonFilters: RscIGUIShortcutButton { + class ButtonFilters : RscIGUIShortcutButton + { idc = 148; shortcuts[] = {"0x00050000 + 3"}; x = 0; @@ -918,9 +1016,10 @@ class RscDisplayGear { w = 0; h = 0; }; - + // Cannot be removed due to crash or something is dependend on it - class ButtonContinue: RscIGUIShortcutButton { + class ButtonContinue : RscIGUIShortcutButton + { idc = 1; shortcuts[] = {"0x00050000 + 0",28,57,156}; x = 0; @@ -929,8 +1028,9 @@ class RscDisplayGear { w = 0; h = 0; }; - - class ButtonClose: RscActiveText { + + class ButtonClose : RscActiveText + { idc = 2; style = "0x30 + 0x800"; text = "\z\addons\dayz_code\gui\gear\gear_ui_close.paa"; @@ -941,13 +1041,15 @@ class RscDisplayGear { color[] = {1,1,1,0.5}; colorActive[] = {1,1,1,0.8}; }; - + // Cannot be removed due to crash or something is dependend on it - class Break_7: RscLineBreak {}; + class Break_7 : RscLineBreak {}; }; - - class ControlsBackground { - class Mainback: RscPicture { + + class ControlsBackground + { + class Mainback : RscPicture + { idc = 1005; x = -0.086; y = -0.03; @@ -956,8 +1058,9 @@ class RscDisplayGear { moving = 0; text = "\z\addons\dayz_code\gui\gear\gear_bg.paa"; }; - - class CA_Gear_slot_primary_background: RscPicture { + + class CA_Gear_slot_primary_background : RscPicture + { idc = 1006; x = 0.603; y = 0.285; @@ -965,8 +1068,9 @@ class RscDisplayGear { h = 0.174; text = "\z\addons\dayz_code\gui\gear\gear_ui_holding.paa"; }; - - class CA_Gear_slot_secondary_background: RscPicture { + + class CA_Gear_slot_secondary_background : RscPicture + { idc = 1007; x = 0.603; y = 0.104; @@ -974,8 +1078,9 @@ class RscDisplayGear { h = 0.174; text = "\z\addons\dayz_code\gui\gear\gear_ui_back.paa"; }; - - class CA_Gear_slot_carry_background: RscPicture { + + class CA_Gear_slot_carry_background : RscPicture + { idc = 1008; x = 0.603; y = 0.468; @@ -983,8 +1088,9 @@ class RscDisplayGear { h = 0.174; text = "\z\addons\dayz_code\gui\gear\gear_ui_carrying.paa"; }; - - class CA_Gear_slot_handgun_background: RscPicture { + + class CA_Gear_slot_handgun_background : RscPicture + { idc = 1009; x = 0.465; y = 0.663; @@ -992,8 +1098,9 @@ class RscDisplayGear { h = 0.177; text = "\z\addons\dayz_code\gui\gear\gear_ui_pistol.paa"; }; - - class CA_Gear_slot_special1_background: RscPicture { + + class CA_Gear_slot_special1_background : RscPicture + { idc = 1010; x = 0.878; y = 0.671; @@ -1003,8 +1110,9 @@ class RscDisplayGear { colorBackgroundSelected[] = {0.6,0.54,0.64,0.8}; text = "\z\addons\dayz_code\gui\gear\gear_ui_vision1.paa"; }; - - class CA_Gear_slot_special2_background: RscPicture { + + class CA_Gear_slot_special2_background : RscPicture + { idc = 1011; x = 0.878; y = 0.861; diff --git a/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp b/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp index 37fbe7c7f..bfb427f83 100644 --- a/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/RscLobby.hpp @@ -1,82 +1,149 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay { - idd = 70; - colorNotAssigned[] = {0.4,0.4,0.4,1}; - colorAssigned[] = {0.78,0.39,0,1}; - colorConfirmed[] = {0,1,0,1}; - onLoad = "[_this] execVM 'z\addons\dayz_code\init\lobbyAutoJoin.sqf'"; - class controls + onload = "with uiNameSpace do{RscDisplayMultiplayerSetup=_this select 0}; [_this] execVM 'z\addons\dayz_code\init\lobbyAutoJoin.sqf'"; //#70 + onMouseHolding = "with uiNameSpace do { switch (1 == 1) do { case(isNil 'RscDMSLoad'): { RscDMSLoad = diag_tickTime; }; case(RscDMSLoad == -1): {}; case(RscDMSLoad == -2): {}; case(diag_tickTime - RscDMSLoad > 7): { RscDMSLoad = diag_tickTime; }; case(diag_tickTime - RscDMSLoad > 5): { }; }; };"; + /* + with uiNameSpace do + { + switch (1 == 1) do + { + case(isNil 'RscDMSLoad'): { RscDMSLoad = diag_tickTime; }; + case(RscDMSLoad == -1): {}; + case(RscDMSLoad == -2): {}; + case(diag_tickTime - RscDMSLoad > 7): { RscDMSLoad = diag_tickTime; }; + case(diag_tickTime - RscDMSLoad > 5): { ctrlActivate ((_this select 0) displayCtrl 1); RscDMSLoad = -1; }; + }; + }; + */ + onButtonClick = "with uiNameSpace do{RscDMSLoad=-1};false"; + onButtonDblClick = "with uiNameSpace do{RscDMSLoad=-1};false"; + onKeyDown = "with uiNameSpace do{RscDMSLoad=-1};false"; + + class controlsbackground { - class TextMission: RscText + class dayz_black: RscText { - idc = 1002; - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(9.5/100) * SafeZoneH + SafeZoneY"; - w = "(18/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03; - text = "Mission:"; + idc=1017; + colorBackground[] = {0,0,0,1}; + x = "SafeZoneX"; + y = "SafeZoneY"; + w = "SafeZoneW"; + h = "SafeZoneH"; }; - class ValueMission: RscText + class MP_roles_TitleBorder: RscText { - idc = 101; - x = "(20/100) * SafeZoneW + SafeZoneX"; - y = "(9.5/100) * SafeZoneH + SafeZoneY"; - w = "(40/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03; + idc=1008; }; + class TextBack: RscText + { + idc=1009; + }; + class TextBorder: RscText + { + idc=1010; + }; + class SidesBack: RscText + { + idc=1011; + y = "(120/100) * SafeZoneH + SafeZoneY"; + }; + class SidesBorder: RscText + { + idc=1012; + y = "(120/100) * SafeZoneH + SafeZoneY"; + }; + class ValueRolesBack: RscText + { + idc=1013; + y = "(120/100) * SafeZoneH + SafeZoneY"; + }; + class ValueRolesBorder: RscText + { + idc=1014; + y = "(120/100) * SafeZoneH + SafeZoneY"; + }; + class ValuePoolBack: RscText + { + idc=1015; + y = "(120/100) * SafeZoneH + SafeZoneY"; + }; + class ValuePoolBorder: RscText + { + idc=1016; + y = "(120/100) * SafeZoneH + SafeZoneY"; + }; + }; + class controls + { class TextIsland: RscText { idc = 1003; - x = "(60/100) * SafeZoneW + SafeZoneX"; - y = "(9.5/100) * SafeZoneH + SafeZoneY"; - w = "(5/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03; - text = "Map:"; + y = "(109.5/100) * SafeZoneH + SafeZoneY"; //hide }; class ValueIsland: RscText { idc = 102; - x = "(65/100) * SafeZoneW + SafeZoneX"; - y = "(9.5/100) * SafeZoneH + SafeZoneY"; - w = "(33/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03; + y = "(109.5/100) * SafeZoneH + SafeZoneY"; //hide }; class TextSide: RscText { idc = 1005; - style = 2; - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(16.5/100) * SafeZoneH + SafeZoneY"; - w = "(16/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03921; - text = "Side:"; + y = "(116.5/100) * SafeZoneH + SafeZoneY"; //hide }; class TextRoles: RscText { - idc = 108; - style = 2; - x = "(20/100) * SafeZoneW + SafeZoneX"; - y = "(16.5/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03921; - text = "Side:"; + idc = 1007; // new, idc was missed by BI + y = "(116.5/100) * SafeZoneH + SafeZoneY"; // hide + }; + class CA_B_West: RscActiveText + { + idc = 104; + y = "(121/100) * SafeZoneH + SafeZoneY"; //hide + }; + class CA_B_East: CA_B_West + { + idc = 105; + y = "(131/100) * SafeZoneH + SafeZoneY"; //hide + }; + class CA_B_Guerrila: CA_B_West + { + idc = 106; + y = "(141/100) * SafeZoneH + SafeZoneY"; //hide + }; + class CA_B_Civilian: CA_B_West + { + idc = 107; + y = "(151/100) * SafeZoneH + SafeZoneY"; //hide + }; + class CA_ValueRoles: RscIGUIListBox + { + idc = 109; + style = 16; + y = "(120.5/100) * SafeZoneH + SafeZoneY"; //hide }; class TextPool: RscText { idc = 1006; - style = 2; - x = "(60/100) * SafeZoneW + SafeZoneX"; - y = "(16.5/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03921; - text = "Pool:"; + x = "(2/100) * SafeZoneW + SafeZoneX"; // to left + w = "(96/100) * SafeZoneW"; //wide (was: 38/100) + }; + class CA_ValuePool: RscIGUIListBox + { + idc = 114; + text = "Players"; + x = "(2/100) * SafeZoneW + SafeZoneX"; // to left + w = "(96/100) * SafeZoneW"; // wide + }; + class CA_ButtonCancel: RscShortcutButton + { + idc = 2; + default = 0; + shortcuts[] = {"0x00050000 + 1"}; + x = "(68/100) * SafeZoneW + SafeZoneX"; + y = "(93/100) * SafeZoneH + SafeZoneY"; + w = 0.203825; + text = "$STR_DISP_BACK"; + onButtonClick = "with uiNameSpace do {RscDMSLoad=nil;};"; // autologon at logon on next server }; class Y_GamerCard: RscActiveText { @@ -102,173 +169,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay y = 0.9; w = 0.15; }; - class CA_MP_roles_Title: CA_Title - { - idc = 1001; - style = 2; - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(02/100) * SafeZoneH + SafeZoneY"; - w = "(96/100) * SafeZoneW"; - h = "(06/100) * SafeZoneH"; - colorBackground[] = {"49/255","36/255","25/255","173/255"}; - text = "Multiplayer Setup"; - }; - class CA_TextVotingTimeLeft: CA_MP_roles_Title - { - idc = 121; - style = 1; - x = "(50/100) * SafeZoneW + SafeZoneX"; - y = "(02/100) * SafeZoneH + SafeZoneY"; - w = "(45/100) * SafeZoneW"; - colorBackground[] = {0,0,0,0}; - }; - class CA_TextDescription: RscText - { - idc = 1004; - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(12.5/100) * SafeZoneH + SafeZoneY"; - w = "(18/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03; - text = "Description:"; - }; - class CA_ValueDescription: RscText - { - idc = 103; - x = "(20/100) * SafeZoneW + SafeZoneX"; - y = "(12.5/100) * SafeZoneH + SafeZoneY"; - w = "(78/100) * SafeZoneW"; - h = "(3/100) * SafeZoneH"; - SizeEx = 0.03; - }; - class CA_B_West: RscActiveText - { - x = "(4.15/100) * SafeZoneW + SafeZoneX"; - y = "(21/100) * SafeZoneH + SafeZoneY"; - w = "(11.7/100) * SafeZoneW"; - h = "(7/100) * SafeZoneH"; - style = "0x02 + 0x100 + 0x40"; - type = 11; - colorActive[] = {1,1,1,1}; - colorDisabled[] = {1,1,1,0.15}; - colorShade[] = {1,1,1,1}; - colorText[] = {1,1,1,1}; - pictureWidth = 1; - pictureHeight = 1; - textHeight = 0.38; - sideDisabled = "ca\ui\data\flag_none_ca.paa"; - sideToggle = "ca\ui\data\flag_side_toggle_ca.paa"; - idc = 104; - color[] = {1,1,1,0.55}; - text = "BLUFOR"; - picture = "\ca\ui\data\flag_bluefor_ca.paa"; - }; - class CA_B_East: CA_B_West - { - idc = 105; - y = "(31/100) * SafeZoneH + SafeZoneY"; - text = "OPFOR"; - picture = "\ca\ui\data\flag_opfor_ca.paa"; - }; - class CA_B_Guerrila: CA_B_West - { - idc = 106; - y = "(41/100) * SafeZoneH + SafeZoneY"; - text = "Independent"; - picture = "\ca\ui\data\flag_indep_ca.paa"; - }; - class CA_B_Civilian: CA_B_West - { - idc = 107; - y = "(51/100) * SafeZoneH + SafeZoneY"; - text = "Civilian"; - picture = "\ca\ui\data\flag_civil_ca.paa"; - }; - class CA_ValueRoles: RscIGUIListBox - { - idc = 109; - style = 16; - x = "(20/100) * SafeZoneW + SafeZoneX"; - y = "(20.5/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(72/100) * SafeZoneH"; - color[] = {1,1,1,1}; - colorSelect[] = {1,1,0,1}; - colorSelectBackground[] = {0.2,0.2,0.2,1}; - colorSelectBackground2[] = {0.1,0.1,0.1,1}; - rowHeight = 0.05; - colorText[] = {0.95,0.95,0.95,1}; - colorPlayer[] = {1,1,0,1}; - colorAI[] = {1,0,0,1}; - colorNobody[] = {0.4,0.4,0.4,1}; - enabledAI = "ca\ui\textures\ai2_on.paa"; - disabledAI = "ca\ui\textures\ai2_off.paa"; - }; - class CA_ValuePool: RscIGUIListBox - { - idc = 114; - style = 16; - x = "(60/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(72/100) * SafeZoneH"; - color[] = {1,1,1,1}; - colorSelect[] = {1,1,0,1}; - colorSelectBackground[] = {0.2,0.2,0.2,1}; - colorSelectBackground2[] = {0.1,0.1,0.1,1}; - rows = 25; - canDrag = 1; - }; - class CA_B_EnableAll: RscShortcutButton - { - idc = 117; - x = "(22/100) * SafeZoneW + SafeZoneX"; - y = "(93/100) * SafeZoneH + SafeZoneY"; - w = 0.223825; - class TextPos - { - left = 0.035; - top = 0.034; - right = 0.005; - bottom = 0.005; - }; - default = 0; - }; - class CA_B_Lock: RscShortcutButton - { - idc = 118; - x = "(39/100) * SafeZoneW + SafeZoneX"; - y = "(93/100) * SafeZoneH + SafeZoneY"; - w = 0.183825; - }; - class CA_B_Params: RscShortcutButton - { - idc = 128; - x = "(53/100) * SafeZoneW + SafeZoneX"; - y = "(93/100) * SafeZoneH + SafeZoneY"; - w = 0.203825; - text = "Parameters"; - }; - class CA_B_DSinterface: RscShortcutButton - { - idc = 1012; - default = 0; - onButtonClick = "openDSInterface;"; - shortcuts[] = {}; - x = "(2.75/100) * SafeZoneW + SafeZoneX"; - y = "(93/100) * SafeZoneH + SafeZoneY"; - w = 0.26; - text = "Server Control"; - }; - class CA_B_Kick: RscShortcutButton - { - idc = 116; - default = 0; - shortcuts[] = {"0x00050000 + 2"}; - x = "(83/100) * SafeZoneW + SafeZoneX"; - y = "(14/100) * SafeZoneH + SafeZoneY"; - text = "Kick Off"; - }; class CA_ButtonContinue: RscShortcutButton { idc = 1; @@ -279,16 +179,6 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay text = "OK"; onButtonClick = "((findDisplay 70) displayCtrl 300) ctrlShow false;"; }; - class CA_ButtonCancel: RscShortcutButton - { - idc = 2; - default = 0; - shortcuts[] = {"0x00050000 + 1"}; - x = "(68/100) * SafeZoneW + SafeZoneX"; - y = "(93/100) * SafeZoneH + SafeZoneY"; - w = 0.203825; - text = "Back"; - }; class infoText: RscText { idc = 300; @@ -301,101 +191,4 @@ class RscDisplayMultiplayerSetup: RscStandardDisplay colorBackground[] = {0,0,0,0}; }; }; - west = "ca\ui\data\flag_bluefor_ca.paa"; - east = "ca\ui\data\flag_opfor_ca.paa"; - guer = "ca\ui\data\flag_indep_ca.paa"; - civl = "ca\ui\data\flag_civil_ca.paa"; - none = "ca\ui\data\flag_civil_ca.paa"; - westUnlocked = "ca\ui\data\flag_bluefor_ca.paa"; - westLocked = "ca\ui\data\flag_bluefor_ca.paa"; - eastUnlocked = "ca\ui\data\flag_opfor_ca.paa"; - eastLocked = "ca\ui\data\flag_opfor_ca.paa"; - guerUnlocked = "ca\ui\data\flag_indep_ca.paa"; - guerLocked = "ca\ui\data\flag_indep_ca.paa"; - civlUnlocked = "ca\ui\data\flag_civil_ca.paa"; - civlLocked = "ca\ui\data\flag_civil_ca.paa"; - disabledAllAI = "Enable AI"; - enabledAllAI = "Disable AI"; - hostLocked = "Unlock"; - hostUnlocked = "Lock"; - class controlsbackground - { - class MP_roles_TitleBorder: RscText - { - style = 64; - colorText[] = {0,0,0,1}; - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(02/100) * SafeZoneH + SafeZoneY"; - w = "(96/100) * SafeZoneW"; - h = "(06/100) * SafeZoneH"; - }; - class TextBack: RscText - { - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(9.5/100) * SafeZoneH + SafeZoneY"; - w = "(96/100) * SafeZoneW"; - h = "(6/100) * SafeZoneH"; - colorBackground[] = {0.1961,0.1451,0.0941,0.42}; - }; - class TextBorder: RscText - { - style = 64; - colorText[] = {0,0,0,1}; - x = "(02/100) * SafeZoneW + SafeZoneX"; - y = "(9.5/100) * SafeZoneH + SafeZoneY"; - w = "(96/100) * SafeZoneW"; - h = "(6/100) * SafeZoneH"; - }; - class SidesBack: RscText - { - x = "(2/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(16/100) * SafeZoneW"; - h = "(73/100) * SafeZoneH"; - colorBackground[] = {0.1961,0.1451,0.0941,0.42}; - }; - class SidesBorder: RscText - { - style = 64; - colorText[] = {0,0,0,1}; - x = "(2/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(16/100) * SafeZoneW"; - h = "(73/100) * SafeZoneH"; - }; - class ValueRolesBack: RscText - { - x = "(20/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(73/100) * SafeZoneH"; - colorBackground[] = {0.1961,0.1451,0.0941,0.42}; - }; - class ValueRolesBorder: RscText - { - style = 64; - colorText[] = {0,0,0,1}; - x = "(20/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(73/100) * SafeZoneH"; - }; - class ValuePoolBack: RscText - { - x = "(60/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(73/100) * SafeZoneH"; - colorBackground[] = {0.1961,0.1451,0.0941,0.42}; - }; - class ValuePoolBorder: RscText - { - style = 64; - colorText[] = {0,0,0,1}; - x = "(60/100) * SafeZoneW + SafeZoneX"; - y = "(20/100) * SafeZoneH + SafeZoneY"; - w = "(38/100) * SafeZoneW"; - h = "(73/100) * SafeZoneH"; - }; - }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/RscDisplay/includes.hpp b/SQF/dayz_code/Configs/RscDisplay/includes.hpp index 78490d2a2..3ca944188 100644 --- a/SQF/dayz_code/Configs/RscDisplay/includes.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/includes.hpp @@ -1,7 +1,7 @@ -#include "RscLobby.hpp" #include "RscDisplayCraftingMenu.hpp" #include "RscDisplayGear.hpp" #include "RscDisplayGenderSelect.hpp" #include "RscDisplaySpawnSelecter.hpp" #include "RscPlayerUI.hpp" #include "RscMap.hpp" +//#include "RscDisplayConstructionMenu.hpp" diff --git a/SQF/dayz_code/Configs/RscDisplay/dialog.hpp b/SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp similarity index 100% rename from SQF/dayz_code/Configs/RscDisplay/dialog.hpp rename to SQF/dayz_code/Configs/RscDisplay/tradermenu.hpp diff --git a/SQF/dayz_code/Configs/cfgFaces.hpp b/SQF/dayz_code/Configs/cfgFaces.hpp index 2f8f54ed3..46944de00 100644 --- a/SQF/dayz_code/Configs/cfgFaces.hpp +++ b/SQF/dayz_code/Configs/cfgFaces.hpp @@ -1,6 +1,6 @@ class Man; // External class reference class Custom; // External class reference -//class Default; +class Default; // External class reference class CfgFaces { class Default; // External class reference diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index f1c4b8ea5..d79fa5123 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -31,7 +31,8 @@ class RscHTML; #include "CfgPlayerStats\p_murders.hpp" #include "CfgPlayerStats\sound.hpp" -class RscPictureGUI { +class RscPictureGUI +{ access = 0; type = 0; idc = -1; @@ -48,23 +49,31 @@ class RscPictureGUI { h = 0.15; }; + class RscStructuredText { class Attributes; }; -class RscStructuredTextGUI: RscStructuredText { +class RscStructuredTextGUI: RscStructuredText +{ colorBackground[] = {0,0,0,0}; colorText[] = {1,1,1,1}; - class Attributes: Attributes { + class Attributes: Attributes + { align = "center"; valign = "middle"; }; }; -class RscDisplayLoading { - class Variants { - class LoadingOne { - class controls { - class LoadingPic : RscPictureKeepAspect { +class RscDisplayLoading +{ + class Variants + { + class LoadingOne + { + class controls + { + class LoadingPic : RscPictureKeepAspect + { text = "z\addons\dayz_code\gui\loadingscreen.paa"; }; }; @@ -76,21 +85,28 @@ class RscCompass : RscObject { scale = 0.64; }; -class RscDisplayStart { - class controls { - class LoadingPic: RscPictureKeepAspect { +class RscDisplayStart +{ + class controls + { + class LoadingPic: RscPictureKeepAspect + { text = "z\addons\dayz_code\gui\loadingscreen.paa"; }; }; }; class RscDisplayGetReady; -class RscDisplayClientGetReady: RscDisplayGetReady { +class RscDisplayClientGetReady : RscDisplayGetReady +{ // could probably add a check in the spawn but couldn't test with multiple players - onload = "private ['_dummy']; _dummy = [_this,'onload'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf'; _this spawn { while { !isNull (findDisplay 53) } do { ctrlActivate ((_this select 0) displayCtrl 1); uiSleep 0.1; }; };"; + onload = "[_this,'onload'] call compile preprocessfile '\ca\ui\scripts\server_interface.sqf'; _this spawn { while { !isNull (findDisplay 53) } do { ctrlActivate ((_this select 0) displayCtrl 1); uiSleep 0.1; }; };"; /*diag_log[diag_tickTime,'RscDisplayClientGetReady'];*/ }; -class RscDisplayDebriefing: RscStandardDisplay { + +class RscDisplayDebriefing: RscStandardDisplay +{ onLoad = "ctrlActivate ((_this select 0) displayCtrl 2);"; - class controls { + class controls + { delete Debriefing_MissionTitle; delete CA_MissionTitle; delete CA_TextVotingTimeLeft; @@ -101,7 +117,8 @@ class RscDisplayDebriefing: RscStandardDisplay { delete CA_DebriefingStatsGroup; delete ButtonStatistics; delete ButtonRetry; - class ButtonContinue: RscIGUIShortcutButton { + class ButtonContinue: RscIGUIShortcutButton + { idc = 2; shortcuts[] = {"0x00050000 + 0",28,57,156}; x = 0.4080875; @@ -109,13 +126,34 @@ class RscDisplayDebriefing: RscStandardDisplay { text = $STR_UI_CONTINUE; }; }; - class ControlsBackground { + class ControlsBackground + { delete Mainback; }; }; -class RscDisplayMissionFail: RscStandardDisplay { - onLoad = "ctrlActivate ((_this select 0) displayCtrl 2);"; - class controls { +class RscShortcutButton; +class RscShortcutButtonMain; + +// RscDisplayMultiplayerSetup moved here: +#include "RscDisplay\RscLobby.hpp" + +class RscPendingInvitation +{ + x = 0.955313 * safezoneW + safezoneX; + y = 0.45 * safezoneH + safezoneY; +}; + +class RscPendingInvitationInGame +{ + x = 0.955313 * safezoneW + safezoneX; + y = 0.46 * safezoneH + safezoneY; +}; + +class RscDisplayMissionFail: RscStandardDisplay +{ + onLoad = "ctrlActivate ((_this select 0) displayCtrl 2);"; /*diag_log[diag_tickTime,'RscDisplayMissionFail'];*/ + class controls + { delete Debriefing_MissionTitle; delete CA_MissionTitle; delete CA_TextVotingTimeLeft; @@ -125,7 +163,8 @@ class RscDisplayMissionFail: RscStandardDisplay { delete CA_DebriefingObjectivesGroup; delete CA_DebriefingStatsGroup; delete BRetry; - class BAbort: RscIGUIShortcutButton { + class BAbort: RscIGUIShortcutButton + { idc = 2; shortcuts[] = {"0x00050000 + 0",28,57,156}; x = 0.4080875; @@ -133,37 +172,43 @@ class RscDisplayMissionFail: RscStandardDisplay { text = $STR_UI_END; }; }; - class ControlsBackground { + class ControlsBackground + { delete Mainback; }; }; + class CA_TextLanguage; class RscXListBox; -class RscDisplayGameOptions { +class RscDisplayGameOptions +{ //onLoad = "((_this select 0) displayCtrl 140) lbAdd 'Default';((_this select 0) displayCtrl 140) lbAdd 'Debug';((_this select 0) displayCtrl 140) lbAdd 'None';((_this select 0) displayCtrl 140) lbSetCurSel (uiNamespace getVariable ['DZ_displayUI', 0]);"; - onUnload = "call ui_changeDisplay;"; - class controls { - class CA_TextUIDisplay: CA_TextLanguage { + onUnload = "call ui_changeDisplay;"; /*diag_log[diag_tickTime,'RscDisplayGameOptions'];*/ + /*class controls + { + class CA_TextUIDisplay: CA_TextLanguage + { x = 0.159803; y = "(0.420549 + 4*0.069854)"; text = "DayZ UI:"; }; - class CA_ValueUIDisplay: RscXListBox { + class CA_ValueUIDisplay: RscXListBox + { idc = 140; x = 0.400534; y = "(0.420549 + 4*0.069854)"; w = 0.3; onLBSelChanged = "(uiNamespace setVariable ['DZ_displayUI', (_this select 1)]);"; }; - }; + };*/ }; -class RscShortcutButton; -class RscShortcutButtonMain; -class RscDisplayMain : RscStandardDisplay { - class controlsBackground { +class RscDisplayMain : RscStandardDisplay +{ + class controlsBackground + { class Mainback : RscPicture { idc = 1104; x = "SafeZoneX + 0.04"; @@ -172,16 +217,19 @@ class RscDisplayMain : RscStandardDisplay { h = 1.000000; text = "\ca\ui\data\ui_mainmenu_background_ca.paa"; }; - class CA_ARMA2 : RscPicture { + class CA_ARMA2 : RscPicture + { text = "z\addons\dayz_code\gui\loadingscreen.paa"; }; }; - class controls { + class controls + { class CA_Version; - class DAYZ_Version : CA_Version { + class DAYZ_Version : CA_Version + { idc = -1; - text = "1.0.6"; + text = "DayZ Epoch 1.0.6"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; @@ -244,7 +292,8 @@ class RscDisplayDiary { }; }; -class RscButtonActionMenu: RscButton { +class RscButtonActionMenu: RscButton +{ SizeEx = 0.02674; colorText[] = {1,1,1,1}; colorBackground[] = {0,0,0,0.8}; @@ -261,8 +310,8 @@ class RscDisplayMPInterrupt : RscStandardDisplay { movingEnable = 0; enableSimulation = 1; //onLoad = "_dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf'; [(_this select 0)] execVM '\z\addons\dayz_code\compile\player_onPause.sqf';"; _respawn = (_this select 0) displayCtrl 1010); _respawn ctrlEnable false; _abort = (_this select 0) displayCtrl 104); _abort ctrlEnable false; - onLoad = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; _dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf';"; - onUnload = "private ['_dummy']; _dummy = ['Unload', _this] execVM '\ca\ui\scripts\pauseOnUnload.sqf';"; + onLoad = "uiNamespace setVariable ['RscDisplayMPInterrupt', _this select 0];[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; _dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf';"; /*diag_log[diag_tickTime,'RscDisplayMPInterrupt'];*/ + onUnload = "uiNamespace setVariable ['RscDisplayMPInterrupt', nil];['Unload', _this] execVM '\ca\ui\scripts\pauseOnUnload.sqf';"; class controlsBackground { class Mainback : RscPicture { @@ -348,7 +397,7 @@ class RscDisplayMPInterrupt : RscStandardDisplay { class CA_B_Abort : CA_B_SAVE { idc = 104; y = 0.2537 + 0.101903 * 4; - onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call player_forceSave;"; + onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call player_forceSave; with uiNameSpace do {RscDMSLoad=-2;};"; // request disconnection from server text = $STR_DISP_INT_ABORT; default = 0; }; @@ -364,6 +413,8 @@ class RscDisplayMPInterrupt : RscStandardDisplay { }; }; + + /* class DZ_ItemInteraction { idd = 6999; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index a7f1bbd66..18c417717 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -108,7 +108,7 @@ class CfgAddons //Epoch Additions #include "Configs\RscDisplay\safegui.hpp" -#include "Configs\RscDisplay\dialog.hpp" +#include "Configs\RscDisplay\tradermenu.hpp" #include "Configs\RscDisplay\deathboards.hpp" #include "Configs\CfgExtra\snappoints.hpp" #include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h" \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index c9fcd1d48..8020797e2 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -6357,6 +6357,7 @@ Mochila de Patrullaje (Coyote) Batůžek (coyote) Trekkingrucksack (Coyote) + Patrouillerugzak (coyote) Patrol Pack (coyote) @@ -6373,6 +6374,7 @@ Mochila de Asalto (ACU) Batoh Assault Pack (ACU) Kampfrucksack (ACU) + Aanvalsrugzak (ACU) Assault Pack (ACU) @@ -6389,6 +6391,7 @@ Bolsa Chaleco Česká vesta Tschechischer Westenrucksack + Tsjechische Borstzak Czech Vest Pouch @@ -6405,6 +6408,7 @@ Mochila Alice Batoh Alice Alice Pack + ALICE Rugzak Alice pack @@ -6421,6 +6425,7 @@ Mochila de Supervivencia ACU Batoh Survival ACU Kampfrucksack (Woodland) + Overlevings ACU Survival ACU @@ -6437,6 +6442,7 @@ Mochila de Asalto Británica Britský batoh Britischer Kampfrucksack + Britse Aanvalsrugzak British Assault Pack @@ -6453,6 +6459,7 @@ Mochila Checa Český batoh Tschechischer Rucksack + Tsjechische Rugzak Czech Backpack @@ -6469,6 +6476,7 @@ Mochila (Coyote) Batoh (coyote) Kampfrucksack (Coyote) + Rugzak (Coyote) Backpack (coyote) diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml index 3a15a6353..9560a6847 100644 --- a/SQF/dayz_epoch_b/stringtable.xml +++ b/SQF/dayz_epoch_b/stringtable.xml @@ -2885,78 +2885,6 @@ Upgrade vozidla byl úspěšný. - - Patrol Pack (coyote) - Patrouille Rucksack (coyote) - Патрульный рюкзак (Койот) - - Patrouillerugzak (coyote) - Sac de Patrouille (coyote) - Baťůžek (coyote) - - - Assault Pack (ACU) - Sturmtrupp Rucksack (ACU) - Рюкзак штурмовика (ACU) - - Aanvalsrugzak (ACU) - Sac d'assaut (ACU) - - - - Czech Vest Pouch - Tschechischer Beutel - Чешский жилет-мешок - - Tsjechische Borstzak - Veste à poches tchèque - - - - ALICE Pack - ALICE Rucksack - - - ALICE Rugzak - Sac Polyvalent (ALICE) - - - - Survival ACU - Survival Rucksack (ACU) - Рюкзак выжившего (ACU) - - Overlevings ACU - Sac de Survivant (ACU) - - - - British Assault Pack - Britischer Sturmtrupp Rucksack - Рюкзак британского штурмовика - - Britse Aanvalsrugzak - Sac d’assaut Britannique - Britský Batoh - - - Czech Backpack - Tschechische Rucksack - Чешский рюкзак - - Tsjechische Rugzak - Sac à dos tchèque - Český Batoh - - - Backpack (Coyote) - Rucksack (Coyote) - Рюкзак (Койот) - - Rugzak (Coyote) - Sac à Dos (coyote) - Batoh (Coyote) - Large Gunbag Große Waffentasche