Commit d0c4888e authored by Kegan's avatar Kegan

Merge branch 'staging' into 'master'

Staging

See merge request DayZ/BattleRoyale!61
parents 3f7cc5d5 711afad2
dayzbr\core
\ No newline at end of file
1
\ No newline at end of file
///'scripts.pbo' from Mikero's dos tools, dll version 5.66///
prefix=dayzbr\core
revision=1
Pbo Type is: Arma Unknown pbo typ (no config).
Sha: '5CAF7A50CB0D1CACBB90A6A0DA4EFC47B8998E0D'
//////</HEADER>//////
class CfgPatches
{
class dayzbr_core
{
units[]={};
weapons[]={};
requiredVersion=0.1;
requiredAddons[]={
};
};
};
class CfgMods
{
class dayzbr
{
dir = "dayzbr";
picture = "";
action = "";
hideName = 1;
hidePicture = 1;
name = "DayZ BattleRoyale";
credits = "Kegan, Vulkan, BigBen, Clarkycal, Legodev";
author = "DayZBR Dev Team";
authorID = "0";
version = "1.0";
extra = 0;
type = "mod";
dependencies[] = {"Game", "World", "Mission"};
class defs
{
/*
class imageSets
{
files[]={"dayzbr/gui/imagesets/dayzbr_gui.imageset"};
};
*/
class gameScriptModule
{
value = "";
files[] = {"dayzbr/scripts/scripts/3_Game"};
};
class worldScriptModule
{
value = "";
files[] = {"dayzbr/scripts/scripts/4_World"};
};
class missionScriptModule
{
value = "";
files[] = {"dayzbr/scripts/scripts/5_Mission"};
};
};
};
};
dayzbr\gui
\ No newline at end of file
1
\ No newline at end of file
///'scripts.pbo' from Mikero's dos tools, dll version 5.66///
prefix=dayzbr\gui
revision=1
Pbo Type is: Arma Unknown pbo typ (no config).
Sha: '5CAF7A50CB0D1CACBB90A6A0DA4EFC47B8998E0D'
//////</HEADER>//////
class CfgPatches
{
class dayzbr_gui
{
units[]={};
weapons[]={};
requiredVersion=0.1;
requiredAddons[]={
};
};
};
MetaFileClass {
Name "{534691EE0479871E}dayzbr/gui/imagesets/dayzbr_gui.edds"
Author "desktop-p85spo9"
ChangeDate 889873776
Configurations {
TGAResourceClass PC {
SourceFile "DayZBR_GUI.tga"
FormatCompress Copy
TiledTexture 0
}
TGAResourceClass XBOX_ONE : PC {
}
TGAResourceClass PS4 : PC {
}
TGAResourceClass LINUX : PC {
}
}
}
\ No newline at end of file
ImageSetClass {
Name "dayzbr_gui"
RefSize 1024 1024
Textures {
ImageSetTextureClass {
mpix 1
path "{534691EE0479871E}dayzbr/gui/imagesets/dayzbr_gui.edds"
}
}
Images {
ImageSetDefClass DayZBRLogo {
Name "DayZBRLogo"
Pos 0 0
Size 494 238
Flags 0
}
ImageSetDefClass DayZBRLogo_White {
Name "DayZBRLogo_White"
Pos 512 0
Size 494 238
Flags 0
}
}
Groups {
}
}
\ No newline at end of file
MetaFileClass {
Name "{8E10FD7133956DCE}dayzbr/gui/imagesets/dayzbr_loading.edds"
Author "desktop-p85spo9"
ChangeDate 1057645936
Configurations {
TGAResourceClass PC {
SourceFile "br_loading.tga"
FormatCompress Medium
TiledTexture 0
}
TGAResourceClass XBOX_ONE : PC {
}
TGAResourceClass PS4 : PC {
}
TGAResourceClass LINUX : PC {
}
}
}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
FrameWidgetClass FrameWidget {
size 1 1
halign center_ref
valign center_ref
priority 995
{
WrapSpacerWidgetClass Licensing {
clipchildren 0
position 0.05 0.062
size 0.45 30
valign bottom_ref
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 1
priority 5
Padding 8
Margin 0
"Size To Content H" 1
"Size To Content V" 1
content_valign center
{
TextWidgetClass version {
visible 1
clipchildren 0
ignorepointer 1
position 80 60
size 1 0.5
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
priority 2
text "#main_menu_version"
font "gui/fonts/sdf_MetronLight24"
"exact text" 0
"text valign" center
}
TextWidgetClass copyright {
visible 1
clipchildren 0
position 80 40
size 1 0.5
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
priority 2
text "#copyright_disclamer"
font "gui/fonts/sdf_MetronLight24"
"exact text" 0
"text valign" center
}
}
}
ImageWidgetClass vignette {
visible 1
ignorepointer 0
color 0 0 0 0.7843
position 0 0
size 1.6 0.9
halign center_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
fixaspect outside
imageTexture "{E6B3EF816E067499}Gui/textures/inventory_bgvignette.edds"
mode blend
"src alpha" 1
"no wrap" 1
stretch 1
filter 0
nocache 1
}
WrapSpacerWidgetClass play_panel_root {
visible 1
ignorepointer 1
position 0.05 130
size 0.2 400
halign right_ref
valign bottom_ref
hexactpos 0
vexactpos 1
hexactsize 0
vexactsize 1
priority 3
Padding 10
Margin 0
"Size To Content H" 1
content_halign center
content_valign bottom
{
WrapSpacerWidgetClass bottom {
visible 1
color 0 0 0 0.7843
position 0 0
size 1 84
halign center_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 1
style DayZDefaultPanel
"no focus" 0
"next left" "news_main"
"next right" "news_main"
"next up" ""
"next down" "exit_button"
Padding 0
Margin 0
"Size To Content H" 1
"Size To Content V" 1
{
ButtonWidgetClass continuebtn {
visible 1
color 0.7843 0 0 1
position 0 0
size 1 84
halign center_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 1
userID 114
style DayZDefaultButtonAll
"no focus" 1
"next left" ""
"next right" ""
"next up" "tutorials"
"next down" "play_video"
text "#main_menu_continue"
text_proportion 0.6
font "gui/fonts/sdf_MetronLight72"
switch normal
}
}
}
WrapSpacerWidgetClass top {
ignorepointer 1
color 0 0 0 0.7843
position 0 0
size 1 48
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 1
style DayZDefaultPanel
"no focus" 1
Padding 0
Margin 0
"Size To Content V" 1
{
ButtonWidgetClass exitbtn {
visible 1
color 0.0392 0.0392 0.0392 1
position 0 0
size 1 38
halign center_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 1
userID 106
style DayZDefaultButtonTop
"no focus" 1
"next left" ""
"next right" ""
"next up" "continuebtn"
"next down" "restartbtn"
text "#main_menu_exit"
text_proportion 0.55
font "gui/fonts/sdf_MetronLight24"
switch normal
}
ButtonWidgetClass restartbtn {
visible 1
color 0.0392 0.0392 0.0392 1
position 0 0
size 1 38
halign center_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 1
userID 105
style DayZDefaultButtonSides
"no focus" 1
"next left" ""
"next right" ""
"next up" "exitbtn"
"next down" "optionsbtn"
text "#main_menu_restart"
text_proportion 0.55
font "gui/fonts/sdf_MetronLight24"
switch normal
}
ButtonWidgetClass optionsbtn {
visible 1
color 0.0392 0.0392 0.0392 1
position 0 0
size 1 38
halign center_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 1
userID 102
style DayZDefaultButtonSides
"no focus" 1
"next left" ""
"next right" ""
"next up" "restartbtn"
"next down" "invitebtn"
text "#layout_xbox_ingame_menu_options"
text_proportion 0.55
font "gui/fonts/sdf_MetronLight24"
switch normal
}
}
}
}
}
ImageWidgetClass dayz_logo {
visible 1
ignorepointer 1
position 80 80
size 400 187.5
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
priority 2
image0 "set:dayzbr_gui image:DayZBRLogo_White"
mode additive
"src alpha" 1
stretch 0
}
}
}
\ No newline at end of file
FrameWidgetClass LoadingFrame {
position 0 0
size 1.025 1.025
halign center_ref
valign center_ref
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
priority 1000
{
PanelWidgetClass PanelWidget1 {
clipchildren 0
color 0 0 0 1
position 0 0
size 1.005 1.005
halign center_ref
valign center_ref
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
style rover_sim_colorable
{
TextWidgetClass TextWidget {
position 0 0.05
size 0.7438 0.06
halign center_ref
valign bottom_ref
text "#layout_loading_loadingtext"
"exact text" 1
"text halign" center
"text valign" center
}
ImageWidgetClass ImageBackground {
position -0.0008 -0.001
size 0.16 0.09
halign center_ref
valign center_ref
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
fixaspect inside
image0 ""
imageTexture "{86B76F0F6250CC15}fmdbr/gui/imagesets/dayzbr_loading.edds"
stretch 1
}
TextWidgetClass ErrorText {
position 0 0.0655
size 0.7438 0.03
halign center_ref
valign bottom_ref
"exact text" 1
"text halign" center
"text valign" center
}
ImageWidgetClass ImageLogoMid {
visible 0
inheritalpha 1
position 0 0
size 444 208
halign center_ref
valign center_ref
hexactpos 0
vexactpos 0
hexactsize 1
vexactsize 1
fixaspect outside
image0 "set:dayzbr_gui image:DayZBRLogo_White"
mode blend
"src alpha" 1
"no wrap" 1
stretch 1
filter 1
nocache 0
}
ImageWidgetClass ImageLogoCorner {
visible 0
inheritalpha 1
position 60 60
size 444 208
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
fixaspect outside
image0 "set:dayzbr_gui image:DayZBRLogo_White"
mode blend
"src alpha" 1
"no wrap" 1
stretch 1
filter 1
nocache 0
}
ImageWidgetClass ImageLoadingIcon {
inheritalpha 0
ignorepointer 0
keepsafezone 0
position 80 80
size 64 64
halign right_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
scaled 1
scriptclass ""
image0 "set:dayz_gui image:icon_refresh"
mode additive
"src alpha" 1
"no wrap" 0
filter 1
nocache 0
}
}
}
}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
FrameWidgetClass StartupFrame {
position 0 0
size 1 1
{
PanelWidgetClass PanelWidget1 {
visible 1
color 0 0 0 1
position 0 0
size 1 1
style rover_sim_colorable
{
ImageWidgetClass ImageWidget {
visible 1
color 1 1 1 1
size 512 0.427
halign center_ref
valign center_ref
hexactsize 1
vexactsize 0
fixaspect fixwidth
imageTexture "{07EC9681964DCC2E}Gui/textures/dayz_logo_small_ca.edds"
mode blend
"src alpha" 1
"no wrap" 1
stretch 0
}
ImageWidgetClass ImageWidget0 {
position 100 100
size 48 48
halign right_ref
valign bottom_ref
hexactpos 1
vexactpos 1
hexactsize 1
vexactsize 1
}
}
}
}
}
\ No newline at end of file
FrameWidgetClass MasterFrame {
position 0 0
size 1 1
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
{
WindowWidgetClass Window {
position 0 0
size 1 1
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
style rover_sim_black
{
PanelWidgetClass Background {
keepsafezone 0
color 0.4471 0.4471 0.4471 1
position 0 0
size 1 1
hexactpos 1
vexactpos 1
hexactsize 0
vexactsize 0
style rover_sim_colorable
}
MapWidgetClass Map {
visible 1
position 0.05 0.08
size 0.9 0.82
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
priority 2
userID 3
}
ButtonWidgetClass BtnSelect {
keepsafezone 0
color 0.3137 0.3137 0.3137 1
position 0.05 0.05
size 0.9 0.05
halign right_ref
valign bottom_ref
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
priority 5
userID 2
draggable 0
style DayZDefaultButton
"no focus" 0
text "Finalize Location"
font "gui/fonts/etelkatextpro16"
switch normal
}
PanelWidgetClass TextBackground {
position 0.05 0.05
size 0.9 0.03
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
priority 5
style rover_sim_black
{
TextWidgetClass TxtTitle {
disabled 0
inheritalpha 0
position 0 0
size 1 1
halign center_ref
hexactpos 0
vexactpos 0
hexactsize 0
vexactsize 0
priority 5
userID 1
style Normal
text "You have 30 seconds left to select a spawn location"
font "gui/fonts/etelkatextpro16"
"exact text" 0
"size to text h" 0
"size to text v" 0
"text halign" center
"text valign" center
}
}
}
}
}
}
}
\ No newline at end of file
......@@ -152,6 +152,7 @@ class BattleRoyale extends BattleRoyaleBase
//check round can be started
bool CanFireNewRound = true;
bool CanSetEnvironment = true;
foreach(ref BattleRoyaleRound round : m_BattleRoyaleRounds)
{
//if any round is in progress but not started, we are waiting to start it & cannot launch a new round at this time
......@@ -160,6 +161,11 @@ class BattleRoyale extends BattleRoyaleBase
CanFireNewRound = false;
break;
}
//if any round is in progress, we can not set the round time / weather when we fire up the parallel match
if(round.inProgress)
{
CanSetEnvironment = false;
}
}
if(CanFireNewRound)
......@@ -169,6 +175,10 @@ class BattleRoyale extends BattleRoyaleBase
if(!round2.inProgress && !round2.RoundStarted)
{
BRLOG("STARTING ROUND " + round2.round_name);
if(CanSetEnvironment)
{
RandomizeServerEnvironment();
}
round2.PlayerCountReached();
return;
}
......@@ -176,6 +186,37 @@ class BattleRoyale extends BattleRoyaleBase
}
}
void RandomizeServerEnvironment()
{
//Set Random Time
int year = 2018;
int month = 12;
int day = 24;
int hour = Math.RandomIntInclusive(8,17); //7am to 5pm
int minute = 0;
GetGame().GetWorld().SetDate(year, month, day, hour, minute);
//Set Random Weather
Weather weather = GetGame().GetWeather();
weather.GetOvercast().SetLimits( 0.0 , 1.0 );
weather.GetRain().SetLimits( 0.0 , 1.0 );
weather.GetFog().SetLimits( 0.0 , 0.25 );
weather.GetOvercast().SetForecastChangeLimits( 0.5, 0.8 );
weather.GetRain().SetForecastChangeLimits( 0.1, 0.3 );