W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-14 20:22:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Merge Conflict 1

Browse Source
This commit is contained in:
icomrade
2016-03-03 22:09:38 -05:00
parent bad0a2e461 479097e7a8
commit 61c64cb14a
175 changed files with 9333 additions and 7650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SQF/dayz_code/Configs/CfgPlayerStats/p__cover.hpp
View File

@@ -18,7 +18,7 @@ class horde_journal_front_cover
controls[] =
{
"book_page_image",
"open_craft",
//"open_craft", //crafting disabled for now
"open_book",
"click_here_to_close_book_1",
"click_here_to_close_book_2",
@@ -40,7 +40,7 @@ class horde_journal_front_cover
};
// buttons
/* // crafting disabled for now
class open_craft: RscIGUIShortcutButton {
idc = -1;
x = 0.48 * safezoneW + safezoneX;
@@ -48,7 +48,7 @@ class horde_journal_front_cover
text = $STR_UI_CRAFT_OPEN;
action = "closeDialog 0; createDialog 'RscDisplayCraftingMenu';";
};
*/
class open_book: horde_RscButton
{
idc = 1900;
@@ -81,7 +81,7 @@ class horde_journal_front_cover
{
idc = 1903;
x = -0.0013379 * safezoneW + safezoneX;
y = 0.832544 * safezoneH + safezoneY;
y = 0.882544 * safezoneH + safezoneY;
w = 1.04825 * safezoneW;
h = 0.892618 * safezoneH;
action = "playSound 'horde_sound_close_book'; closeDialog 0;";

8
SQF/dayz_code/Configs/CfgPlayerStats/p_humanity_art.hpp
View File

@@ -47,7 +47,7 @@ class horde_journal_pages_humanity_art
class left_page_middle: horde_RscPicture
{
idc = 1201;
text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_middle_1.paa";
//text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_middle_1.paa";
x = 0.209053 * safezoneW + safezoneX;
y = 0.27261 * safezoneH + safezoneY;
w = 0.282496 * safezoneW;
@@ -56,7 +56,7 @@ class horde_journal_pages_humanity_art
class left_page_bottom: horde_RscPicture
{
idc = 1202;
text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_bottom_1.paa";
//text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_bottom_1.paa";
x = 0.203156 * safezoneW + safezoneX;
y = 0.468726 * safezoneH + safezoneY;
w = 0.291609 * safezoneW;
@@ -65,7 +65,7 @@ class horde_journal_pages_humanity_art
class left_page_top: horde_RscPicture
{
idc = 1203;
text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_top_1.paa";
//text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_top_1.paa";
x = 0.209111 * safezoneW + safezoneX;
y = 0.0901794 * safezoneH + safezoneY;
w = 0.291609 * safezoneW;
@@ -77,7 +77,7 @@ class horde_journal_pages_humanity_art
class right_page_picture: horde_RscPicture
{
idc = 1204;
text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_3.paa";
//text = "\z\addons\dayz_communityassets\pictures\playerstats\humanity\humanity_bandit_3.paa";
x = 0.43621 * safezoneW + safezoneX;
y = 0.167545 * safezoneH + safezoneY;
w = 0.419188 * safezoneW;

11
SQF/dayz_code/Configs/RscDisplay/RscDisplayCraftingMenu.hpp
View File

@@ -3,7 +3,7 @@ class RscListNBox;
class RscDisplayCraftingMenu {
idd = 6903;
enableDisplay = 1;
onLoad = "uiNamespace setVariable ['DAYZ_CraftingDialog', _this select 0]; ['init'] call fn_updateCraftUI;";
onLoad = "uiNamespace setVariable ['DAYZ_CraftingDialog', _this select 0]; ['initcrafting'] call fn_updateCraftUI;";
onUnload = "['close'] call fn_updateCraftUI;";
class Controls
@@ -90,6 +90,15 @@ class RscDisplayCraftingMenu {
text = $STR_UI_START_CRAFTING;
action = "['craft'] call fn_updateCraftUI;";
};
/*
class ConstructionButton: RscIGUIShortcutButton {
idc = 430;
x = 0.631 * safezoneW + safezoneX;
y = 0.744 * safezoneH + safezoneY;
text = "Construction";
action = "['construction'] call fn_updateCraftUI;";
};
*/
class craftingslot01: RscPicture
{

4
SQF/dayz_code/Configs/RscDisplay/RscDisplayGear.hpp
View File

@@ -825,7 +825,7 @@ class RscDisplayGear {
h = 0.174;
color[] = {1,1,1,0.5};
colorActive[] = {1,1,1,0.8};
action = "[""gear""] call player_switchWeapon";
action = "0 call dz_fn_switchWeapon";
};
class Button2: RscActiveText {
@@ -840,7 +840,7 @@ class RscDisplayGear {
h = 0.174;
color[] = {1,1,1,0.5};
colorActive[] = {1,1,1,0.8};
action = "[""gear""] call player_switchWeapon";
action = "0 call dz_fn_switchWeapon";
};
};
};