mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 04:02:37 +03:00
Add hidden gear display for force saves
Vanilla commits:a4f86904049170e0f8a0
This commit is contained in:
@@ -6,6 +6,8 @@
|
|||||||
[UPDATED] Zombie pathing. Zeds should now run more direct to players.
|
[UPDATED] Zombie pathing. Zeds should now run more direct to players.
|
||||||
[UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
|
[UPDATED] The RIS attachment can be removed from the SA58_RIS_DZ now. @LunaCB
|
||||||
[UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
|
[UPDATED] The player now auto rejoins their group after dropping a radio and picking it back up when dayz_requireRadio=true. @SmokeyBR
|
||||||
|
[UPDATED] Owners can no longer be removed by added friends in plot and door management. @oiad
|
||||||
|
[UPDATED] A new hidden version of the gear menu is now used for force saves so players do not see the dialog flash on screen.
|
||||||
|
|
||||||
[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
|
[FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
|
||||||
[FIXED] Trees at POIs can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down.
|
[FIXED] Trees at POIs can be chopped down now. Other trees spawned with createVehicle can be added to dayz_treeTypes in variables.sqf to allow chopping them down.
|
||||||
|
|||||||
237
SQF/dayz_code/Configs/RscDisplay/RscDisplayGearMinimal.hpp
Normal file
237
SQF/dayz_code/Configs/RscDisplay/RscDisplayGearMinimal.hpp
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
/*
|
||||||
|
createGearDialog [player, "RscDisplayGearMinimal"];
|
||||||
|
*/
|
||||||
|
|
||||||
|
class RscDisplayGearMinimal
|
||||||
|
{
|
||||||
|
idd = 106;
|
||||||
|
enableDisplay = 0;
|
||||||
|
movingEnable = 0;
|
||||||
|
|
||||||
|
emptyGun = "";
|
||||||
|
emptySec = "";
|
||||||
|
emptyEq = "";
|
||||||
|
emptyMag = "";
|
||||||
|
emptyMag2 = "";
|
||||||
|
emptyHGun = "";
|
||||||
|
emptyHGunMag = "";
|
||||||
|
class controlsBackground {
|
||||||
|
};
|
||||||
|
class objects {
|
||||||
|
};
|
||||||
|
class controls
|
||||||
|
{
|
||||||
|
class G_GearItems : RscControlsGroup
|
||||||
|
{
|
||||||
|
idc = 160;
|
||||||
|
x = 0.465;
|
||||||
|
y = 0.104;
|
||||||
|
w = 0.533;
|
||||||
|
h = 0.928;
|
||||||
|
|
||||||
|
class Controls
|
||||||
|
{
|
||||||
|
delete B_Close;
|
||||||
|
delete B_Rearm;
|
||||||
|
delete B_OpenBag;
|
||||||
|
delete B_CloseBag;
|
||||||
|
delete Title;
|
||||||
|
delete SoldiersValue;
|
||||||
|
delete Pool;
|
||||||
|
delete Skill;
|
||||||
|
delete Vehicle;
|
||||||
|
delete Weapons;
|
||||||
|
delete B_Remove;
|
||||||
|
delete B_Add;
|
||||||
|
class CA_Gear_slot_item1 : RscActiveText
|
||||||
|
{
|
||||||
|
idc = 109;
|
||||||
|
x = 0;
|
||||||
|
y = 0;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
style = "0x30 + 0x800";
|
||||||
|
onMouseButtonDown = "_this call player_selectSlot;";
|
||||||
|
soundDoubleClick[] = {"",0.1,1};
|
||||||
|
color[] = {1,1,1,1};
|
||||||
|
colorBackground[] = {0.84,0.8,0.72,0.2};
|
||||||
|
colorBackgroundSelected[] = {0.84,0.8,0.72,0.2};
|
||||||
|
colorFocused[] = {0,0,0,0};
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
{
|
||||||
|
idc = 111;
|
||||||
|
x = 0;
|
||||||
|
y = 0.091;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
{
|
||||||
|
idc = 113;
|
||||||
|
x = 0;
|
||||||
|
y = 0.181;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
{
|
||||||
|
idc = 115;
|
||||||
|
x = 0;
|
||||||
|
y = 0.272;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
{
|
||||||
|
idc = 117;
|
||||||
|
x = 0;
|
||||||
|
y = 0.364;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
{
|
||||||
|
idc = 119;
|
||||||
|
x = 0;
|
||||||
|
y = 0.457;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
};
|
||||||
|
|
||||||
|
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_item1 : CA_Gear_slot_item1
|
||||||
|
{
|
||||||
|
idc = 122;
|
||||||
|
x = 0.138;
|
||||||
|
y = 0.559;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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
|
||||||
|
{
|
||||||
|
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
|
||||||
|
{
|
||||||
|
idc = 129;
|
||||||
|
x = 0.345;
|
||||||
|
y = 0.65;
|
||||||
|
w = 0.064;
|
||||||
|
h = 0.085;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
#include "RscGroups.hpp"
|
#include "RscGroups.hpp"
|
||||||
#include "RscDisplayCraftingMenu.hpp"
|
#include "RscDisplayCraftingMenu.hpp"
|
||||||
#include "RscDisplayGear.hpp"
|
#include "RscDisplayGear.hpp"
|
||||||
|
#include "RscDisplayGearMinimal.hpp"
|
||||||
#include "RscDisplayGenderSelect.hpp"
|
#include "RscDisplayGenderSelect.hpp"
|
||||||
#include "RscDisplaySpawnSelecter.hpp"
|
#include "RscDisplaySpawnSelecter.hpp"
|
||||||
#include "RscPlayerUI.hpp"
|
#include "RscPlayerUI.hpp"
|
||||||
|
|||||||
@@ -8,5 +8,6 @@ _alive = alive _unit;
|
|||||||
|
|
||||||
|
|
||||||
if (_unconcious && !_inVeh && _alive) then {
|
if (_unconcious && !_inVeh && _alive) then {
|
||||||
|
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on _unit's gear
|
||||||
player action ["Gear", _unit];
|
player action ["Gear", _unit];
|
||||||
};
|
};
|
||||||
@@ -1,22 +1,18 @@
|
|||||||
/*
|
/*
|
||||||
count player magazines with ammo count
|
count player magazines with ammo count
|
||||||
value = call player_countMagazines;
|
value = call player_countMagazines;
|
||||||
return all player magazines with ammo count
|
return all player magazines with ammo count
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private ["_dialog","_created","_magazineArray"];
|
private ["_dialog","_created","_magazineArray"];
|
||||||
disableSerialization;
|
disableSerialization;
|
||||||
disableUserInput true;
|
|
||||||
disableUserInput true;
|
|
||||||
disableUserInput true;
|
|
||||||
|
|
||||||
_dialog = findDisplay 106;
|
_dialog = findDisplay 106;
|
||||||
_created = false;
|
_created = false;
|
||||||
|
|
||||||
if ( isNull _dialog ) then {
|
if ( isNull _dialog ) then {
|
||||||
//startLoadingScreen [""];
|
//Load Minimal gearMenu
|
||||||
DZE_GearCheckBypass = true; //Bypass gear menu checks since dialog will always open on player's gear
|
createGearDialog [player, "RscDisplayGearMinimal"];
|
||||||
skipGearSound = true; //Don't play sound for force save
|
|
||||||
createGearDialog [player, "RscDisplayGear"];
|
|
||||||
_dialog = findDisplay 106;
|
_dialog = findDisplay 106;
|
||||||
_created = true;
|
_created = true;
|
||||||
};
|
};
|
||||||
@@ -55,11 +51,6 @@ for "_i" from 122 to 129 do
|
|||||||
|
|
||||||
if ( _created ) then {
|
if ( _created ) then {
|
||||||
closeDialog 0;
|
closeDialog 0;
|
||||||
skipGearSound = false;
|
|
||||||
//endLoadingScreen;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
disableUserInput false;
|
|
||||||
disableUserInput false;
|
|
||||||
disableUserInput false;
|
|
||||||
_magazineArray
|
_magazineArray
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
count player magazines with ammo count
|
count player magazines with ammo count
|
||||||
value = call player_countMagazines; //must be called from a spawned thread (|| use spawn)
|
value = call player_countMagazines; //must be called from a spawned thread (or use spawn)
|
||||||
return all player magazines with ammo count
|
return all player magazines with ammo count
|
||||||
Modified to save backpack magazine count by icomrade - Base for fix by Ziellos2k
|
Modified to save backpack magazine count by icomrade - Base for fix by Ziellos2k
|
||||||
*/
|
*/
|
||||||
private ["_control","_item","_val","_max","_count","_magazineArray","_dialog"];
|
private ["_control","_item","_val","_max","_count","_magazineArray","_dialog"];
|
||||||
disableUserInput true;
|
disableUserInput true;
|
||||||
|
|||||||
Reference in New Issue
Block a user