From d576657e5a2ef47ce3da2cfda367a470edb5b4b5 Mon Sep 17 00:00:00 2001 From: SchnitzelPommes <41128311+SchnitzelPommes@users.noreply.github.com> Date: Wed, 13 Feb 2019 22:53:43 +0100 Subject: [PATCH] Update 1.01 --- DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo | Bin 303962 -> 304567 bytes .../DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign | Bin 568 -> 568 bytes .../scripts/4_World/LogSystem/DeathHandler.c | 10 +- .../scripts/4_World/LogSystem/LogHandler.c | 2 +- .../scripts/5_Mission/M_MissionGameplay.c | 18 +-- .../scripts/5_Mission/M_MissionServer.c | 2 +- .../modules/Files/Player/PermissionBase.c | 3 + .../core/modules/Files/Player/PlayerModule.c | 72 +++++------ .../core/modules/GUI/AdminMenuAbout2.c | 44 +++++++ .../5_Mission/core/modules/GUI/AdminMenuGui.c | 8 +- .../core/modules/GUI/AdminMenuPlayer.c | 5 +- .../modules/GUI/Layouts/Admin_About.layout | 2 +- .../modules/GUI/Layouts/Admin_Commands.layout | 2 +- .../modules/GUI/Layouts/Admin_Main.layout | 115 ++++++------------ .../core/modules/GUI/Layouts/Admin_Map.layout | 2 +- .../modules/GUI/Layouts/Admin_Player.layout | 2 +- .../modules/GUI/Layouts/Admin_Spawn.layout | 2 +- .../modules/GUI/Layouts/Admin_Teleport.layout | 2 +- .../5_Mission/core/modules/HordeModule.c | 2 +- 19 files changed, 150 insertions(+), 143 deletions(-) create mode 100644 DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuAbout2.c diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo index b989092c2dfd941a5c9ff551e38962e7e89186cf..b6b1d379dfa829a3dd8ee0f0323ff97342c12650 100644 GIT binary patch delta 1842 zcmZ{jYitx%7=}G(PP_MMx4SOAL8pb~Qt0f=?5#^%dcjC>0b2wMcFVGDm)hD=SPI5F z2nNAuDjWSoC{P22Mq@AwoQi~0ZMuR4iis8F2Y)m%fnG>TObi!iXWCkWo*$EMp7(vf zb7sytzYe6)AJR^ZGo}OFW6JpPaAV*=6cL{F%~Q!znfT^KUng9wj%bi6lB)9RrT#!9 zx;1GbJCv`ICztpGL-|orml69eX$Y}HW|c>dGzNyuGS7{Eui46`TUFds?hm9}75u!G zV~5LCoGZJB%N0zuCo{|I+qZW}e1jsMNm4ysMU{awQ9-wd_1aYuzq35xwaY0!I;QJl zj|(c^ob^=TxS-&R`X2VAMa8uhm4TBM8QY^}CKlexWKvXxGpdH?WCLfMG(@$=RJP8q zO1Qi-Q0JeL)*Dk;q*0~yatdjtq#k1$yVIsh&&twH+mv+AXl8pS7PC&4dM6i?$Cen> z#9A4b7$y?hSeI$=)7X~ND{-vv>?%{VV!#q@>9<9@;`*pCV2`!*??y7T$7}=kL}7{U zi(6xx;F$=I8k%4Ylg0k(2HWnx=MYg>s z8W26vfD4N0Pe-wRZmzB>(!9B2eqL2L(#BPUwuQO1TN*OpTn+e*b1RxT*x>a92}f1t_|a&==>8b(Is&D2+mP- z?+9M66rCeDGodHx6ayW>3$3#AHIw|eb(13z9UH-tl8_4<6pms}d0RJ%eM<5ED1JQA zNUJnz2t~j#OEz8}#jb?@;TZNSKK~egS}8sr!>j*$s=vnY9+FrD+0NUC@&UQmj118wH?*{W1yi{SI~?$33sXw{hnU+q zDcmX_F1WUjvBIn8u>|q`jG4NRFxHyn;F{)+)-V{&qznEiB1U@uE<>^=FqQE+E#nph zs7@y~I8{ebfeoc3bnyVNQ~qywmBN>XG3j%QRlzBf13%LQZ1UdL-Ui=#~v~$1Fq- zxX3Y_BJhPSpTrdiyx?{VE*RvAmG!v!!o)PZ&s`{aVV9R!X_ZJWBD%;Yf0RbxB~f&F zCf4rbMVB}=@6u8-g9=VkkF=utcU`cPC-dM+G0A|wIV2mnW#mt$W_cA17m=@!3pzcd z`~Q1>gW%F4qNhPWxnO|e)x?H8FzXp|8fMmz^vNCU8)s(ImKri*nk0!mJ-dmdv(o|X z>mZB&O+ML89;8k8z}F6vLVL|5jOh7~$bP-G;;!MHo;5eWXsY`8U~PBxdz%JdJpVU3 Cr4qdW delta 1708 zcmb7?YfMyE5XXDY8QJH(!h$>utQYDEg0OdaNaZE42uaB*1g#LS!Br7gl;v^38lxeN zR*fMcxvitE4``*aNlmQV_QXU}(i*g_Mw_(0>$f(ku?rZ}Xf>vny_gcyH1vF${N_LZ znaLUcgX7MqI~WQ^+k%W?xifn=kJ)V ziZV^9V)KSU*2wO9nJH1%}S-P6(1m9wJV7wGN| z1lt=_f0vqprAtXN-fJdSJX1={*c4y_e(0kv9K1mVg7z#Dvvl zBzAIwc)qoaq`RowjnzxZ!hPpA5Pp6G%`TaolmC8#x)$)_Q3?b%U!qqq$wA|}dYP^Q zT=Wgy#64GO;XJh7p;qj;NB5)s4_b>mexzqHAxz)Exew@U^oQv}><`moTuYf9?}X_* zd>*DvLSU1WA$9pT2K;KU>(G2U7x#|QEOD1$o!ort;l(kUi%-YsV$2<Z?>~1CpJ8_lOQBgbp5WWBjhb&RKAm z#LT=th3!wAy|QI%OGmIvwQOrvgByc*EuT5#UV*vA`i$7wPUjrzWN{e&Os|#}vln*W z<7Fo)%GIoxzf;Yk1&iCgt+`^oe#AJhfu(8J-vd6uoFqs1l*bgDds4-K$bjK{5%7k zSeptrs7K~$X;1^K&?Do}0*J?v42Z!&85Ur)8w5UB3$2998BhddF{a88|KC#7rB2?K z1G9kU<;}DJ)qGgPGb_MF_>%${qBHM>M~k2a%bj53gBg%ccxnj@QkuVHroH*Ka!3Z2 z?V0g43S=I(9*KWKtPM?;IM2HIP@SGK&Zt`2N$ZBa2M8D8gin;{O@v|uLw>}$Dx0D_kzqth(&w9@e{SAsw B_!R&E diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato.pbo.SchnitzelPommes.bisign index 0c17724fdd5120c471b97a5e14353120d4654fa9..593dd2f841daac314b1433790d3b313d1f0749fe 100644 GIT binary patch delta 406 zcmV;H0crlY1h@o{tbY)WDtzQc|H~}|3aQK!g_dFmh(Ek>V(^OT z^r!g3r>&ET{u{k`dH2Tpn1a>Ydi&jHK^1n`(wzsP)^2yqEIJn=<*@4}vyX*A=sh;Fsn;<)FFbQ_@pfuarE`)?hgNE2%#e{Wt+kEcd)b7=IlC0001h0002V#8yx+ zh2aEr6jC3xQexJHLZ-P(c!VTs$$ZVhq4M*PKnV*c<#yS82H5q{+JH{P!facN#w8-K zXS?HhI1lxNfcBEs1yROc4_Eu99GSQ{$yoI&>7JwKYSrPEHvuIup?Hb_M^g~a-bKy2 z${R93W3EM4RRDa>VAj#R$(_F%cxlUv*a`gO2$em%h7TxaTA9`e@i@LIn6aVMc9$;6 AYybcN delta 406 zcmV;H0crlY1h@o{tba*LDxWEoWz5F{jR_!&=-pFoucf)pla}L+h&M~eFImO!{Jcv8 zA%oK5uE=kJP+q%fL5x}L7KCfSUsb6Gu7TW8b?`)=2%B?8Q`;c5xZxbRNFkm#U;SUt zE{+|y z3|JROaVHL@lTQl_WGH%)!|BuAziY-QbL zc~5PU-?NgQ!hd^!(to1&q`=`ufB*mhT)v2-Z(DyZi`AwddiR*gUwySB`GrNkzR&!( z(@{v~m)1KloHCa<2IVJlSh%*wx=#&8_)c?d`Yu>@01NRXx^7mR_e?kB&c)9}$sm%G z3~&ekl-QO96L|>uj$)!@eEO#h!FVlgB**&v89Hs55)W0KI^-Xw8wmK&-N~fL8B^}c A1^@s6 diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/DeathHandler.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/DeathHandler.c index ed074e9..766870b 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/DeathHandler.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/DeathHandler.c @@ -84,7 +84,7 @@ class DeathHandler { msg = GetMessage(GetFileHandler().GetConfig("Welcome_Message_Join"), VName); int count = msg.Replace("{Player}", player.GetName()); - GetGame().ChatPlayer(0, msg); + GetGame().ChatPlayer(msg); } } void KilledHandler(Object killer, PlayerBase pbKilled) @@ -108,7 +108,7 @@ class DeathHandler { if (OutMessage != "") { - GetGame().ChatPlayer(0, OutMessage); + GetGame().ChatPlayer(OutMessage); } } @@ -237,7 +237,7 @@ class DeathHandler string KilledBySuicide = GetFileHandler().GetConfig("KillFeed_Suicide"); Killedname = sbKilled.GetPFullName(); - GetGame().ChatPlayer( 0, GetMessage(KilledBySuicide, Killedname)); + GetGame().ChatPlayer(GetMessage(KilledBySuicide, Killedname)); // TL.all(GetMessage(KilledBySuicide, Killedname)); // TL.all(sbKilled.GetPFullName() + " took his own life"); @@ -247,14 +247,14 @@ class DeathHandler string KilledByPlayer = GetFileHandler().GetConfig("KillFeed_ByPlayer"); Killername = sbKiller.GetPFullName(); Killedname = sbKilled.GetPFullName(); - GetGame().ChatPlayer( 0, GetMessage(KilledByPlayer, Killedname , Killername)); + GetGame().ChatPlayer(GetMessage(KilledByPlayer, Killedname , Killername)); // TL.all(GetMessage(KilledByPlayer, Killedname, Killername)); } } else { string KilledByBleed = GetFileHandler().GetConfig("KillFeed_Bleeding_Zombie"); Killedname = sbKilled.GetPFullName(); - GetGame().ChatPlayer( 0, GetMessage(KilledByBleed, Killedname)); + GetGame().ChatPlayer(GetMessage(KilledByBleed, Killedname)); // TL.all(GetMessage(KilledByBleed, Killedname)); } } diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/LogHandler.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/LogHandler.c index 4856ad8..17fabf0 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/LogHandler.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/4_World/LogSystem/LogHandler.c @@ -137,7 +137,7 @@ class LogHandler if ( GetGame().IsServer() ) { - GetGame().ChatPlayer(0, msg); + GetGame().ChatPlayer(msg); }else{ ScriptRPC Rpc = new ScriptRPC(); Rpc.Write(msg); diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionGameplay.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionGameplay.c index cd62514..45330cf 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionGameplay.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionGameplay.c @@ -35,7 +35,7 @@ modded class MissionGameplay Print( " Mission Gameplay Constructor "); m_LogHandler = new ref LogHandler(); // m_AdminMenuGui = new ref AdminMenuGui(); - // m_PermissionBase = new ref PermissionBase; + m_PermissionBase = new ref PermissionBase; devTeleport = new DevTeleport(); devCam = new DevCam(); adminMenu = new AdminMenu(); @@ -49,7 +49,7 @@ modded class MissionGameplay delete m_LogHandler; delete adminMenuManager; delete adminMenu; - // delete m_PermissionBase; + delete m_PermissionBase; } override void OnInit() @@ -59,17 +59,17 @@ modded class MissionGameplay Print( " Mission Gameplay "); } - // override void OnMissionStart() - // { + override void OnMissionStart() + { - // super.OnMissionStart(); - // m_PermissionBase.OnStart(); - // GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Player_UpdatePlayers, new Param1( "" ), false, NULL ); - // } + super.OnMissionStart(); + m_PermissionBase.OnStart(); + GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Player_UpdatePlayers, new Param1( "" ), false, NULL ); + } override void OnMissionFinish() { - // m_PermissionBase.OnFinish(); + m_PermissionBase.OnFinish(); GetGame().GetUIManager().CloseMenu( MENU_INGAME ); super.OnMissionFinish(); } diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionServer.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionServer.c index 0ce30f2..1466f3a 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionServer.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/M_MissionServer.c @@ -263,7 +263,7 @@ modded class MissionServer { super.OnUpdate( timeslice ); - //m_PermissionBase.OnUpdate( timeslice ); + m_PermissionBase.OnUpdate( timeslice ); } void CLogInfo(string log) diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PermissionBase.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PermissionBase.c index ced711b..5cb363f 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PermissionBase.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PermissionBase.c @@ -140,6 +140,7 @@ class PermissionBase Adding.Write(PData); Adding.Send(NULL, M_RPCs.M_Admin_Player_UpdatePlayer, true, sender); //GetRPCManager().SendRPC( "PermissionBase", "UpdatePlayer", new Param1< ref PlayerDataN >( SerializePlayer( GetFileHandler().GetPlayers().Get( i ) ) ), true, sender ); + Print("Perm Base Update PLayers"); } } } @@ -150,6 +151,7 @@ class PermissionBase { ctx.Read(PData); GetFileHandler().FPPlayers.RemoveItem( DeserializePlayer( PData ) ); + Print("Perm Base remove Player"); } break; @@ -158,6 +160,7 @@ class PermissionBase { ctx.Read(PData); DeserializePlayer( PData ); + Print("Perm Base Update Player"); } break; diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PlayerModule.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PlayerModule.c index afa7e7b..d2fcf46 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PlayerModule.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/Files/Player/PlayerModule.c @@ -31,7 +31,7 @@ class PlayerModule { } - + /* void ReceiveRPC( PlayerIdentity sender, Object target, int rpc_type, ParamsReadContext ctx ) { PlayerBase Admin; @@ -331,53 +331,53 @@ class PlayerModule break; case M_RPCs.M_Admin_Player_RepairTransport: - ctx.Read(Dstring); - if ( !FileHandler().HasPermission( "Admin", sender ) ) - return; - if ( GetGame().IsServer() ) - { - array< Transport > completedTransports = new array< Transport >; + // ctx.Read(Dstring); + // if ( !FileHandler().HasPermission( "Admin", sender ) ) + // return; + // if ( GetGame().IsServer() ) + // { + // array< Transport > completedTransports = new array< Transport >; - players = DeserializePlayersGUID( Dstring ); + // players = DeserializePlayersGUID( Dstring ); - for (i = 0; i < players.Count(); i++ ) - { - player = players[i].PlayerObject; + // for (i = 0; i < players.Count(); i++ ) + // { + // player = players[i].PlayerObject; - if ( player == NULL || player.GetTransport() == NULL ) continue; + //if ( player == NULL || player.GetTransport() == NULL ) continue; - Transport transport = player.GetTransport(); + // Transport transport = player.GetTransport(); - if ( completedTransports.Find( transport ) > -1 ) - { - ItemBase radiator; + // if ( completedTransports.Find( transport ) > -1 ) + // { + // ItemBase radiator; - Class.CastTo( radiator, transport.FindAttachmentBySlotName("CarRadiator") ); + // Class.CastTo( radiator, transport.FindAttachmentBySlotName("CarRadiator") ); - if ( radiator ) - { - radiator.SetHealth( "", "", 1 ); - } + // if ( radiator ) + // { + // radiator.SetHealth( "", "", 1 ); + // } - transport.SetHealth( "Engine", "", 1 ); - transport.SetHealth( "FuelTank", "", 1 ); + // transport.SetHealth( "Engine", "", 1 ); + // transport.SetHealth( "FuelTank", "", 1 ); - CarScript car = CarScript.Cast( transport ); + // CarScript car = CarScript.Cast( transport ); - if ( car ) - { - car.Fill( CarFluid.FUEL, car.GetFluidCapacity( CarFluid.FUEL ) ); - car.Fill( CarFluid.OIL, car.GetFluidCapacity( CarFluid.OIL ) ); - car.Fill( CarFluid.BRAKE, car.GetFluidCapacity( CarFluid.BRAKE ) ); - car.Fill( CarFluid.COOLANT, car.GetFluidCapacity( CarFluid.COOLANT ) ); - } + // if ( car ) + // { + // car.Fill( CarFluid.FUEL, car.GetFluidCapacity( CarFluid.FUEL ) ); + // car.Fill( CarFluid.OIL, car.GetFluidCapacity( CarFluid.OIL ) ); + // car.Fill( CarFluid.BRAKE, car.GetFluidCapacity( CarFluid.BRAKE ) ); + // car.Fill( CarFluid.COOLANT, car.GetFluidCapacity( CarFluid.COOLANT ) ); + // } - completedTransports.Insert( transport ); + // completedTransports.Insert( transport ); //COTLog( sender, "Repaired transport for " + players[i].GetGUID() ); - } - } - } + // } + // } + // } break; case M_RPCs.M_Admin_Player_TeleportToMe: @@ -587,5 +587,5 @@ class PlayerModule // break; } } - + */ } \ No newline at end of file diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuAbout2.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuAbout2.c new file mode 100644 index 0000000..d0b2449 --- /dev/null +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuAbout2.c @@ -0,0 +1,44 @@ + /* + DayZ SA Tomato Gui Admin tool for DayZ Standalone. Contact DayZ-SA-Tomato@Primary-Network.de + Copyright (C) 2018 DayZ-SA-Tomato + + This file is part of DayZ SA Tomato. + + DayZ SA Tomato is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + DayZ SA Tomato is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DayZ SA Tomato. If not, see . + */ +class AdminMenuGuiAbout2 extends ScriptedWidgetEventHandler +{ + + protected Widget m_Root; + protected AdminMenuGui m_Menu; + protected MultilineTextWidget m_Text_Txt; + void AdminMenuGuiAbout2( Widget parent, AdminMenuGui menu ) + { + m_Root = GetGame().GetWorkspace().CreateWidgets( "com\\DayZ-SA-Tomato\\scripts\\5_Mission\\core\\modules\\GUI\\Layouts\\Admin_About.layout", parent ); + m_Menu = menu; + m_Text_Txt = MultilineTextWidget.Cast( m_Root.FindAnyWidget( "Text_About_Txt" ) ); + } + + void ~AdminMenuGuiAbout2() + { + + } + + + void Focus() + { + + } + +} diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuGui.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuGui.c index 9cf4814..7f89bd6 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuGui.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuGui.c @@ -26,8 +26,7 @@ class AdminMenuGui extends UIScriptedMenu protected ref AdminMenuGuiMap m_MapTab; protected ref AdminMenuGuiTeleport m_TeleportTab; protected ref AdminMenuGuiAbout m_AboutTab; - protected ref AdminMenuGuiTeleport m_todo; - protected ref AdminMenuGuiTeleport m_todo2; + protected ref AdminMenuGuiAbout2 m_AboutTab2; ref AdminMenuManager AMenuM; protected ref map m_TestListS; protected string m_TestListPath = "$CurrentDir:\\DayZ-SA-Tomato\\"; @@ -151,6 +150,7 @@ class AdminMenuGui extends UIScriptedMenu m_MapTab = new AdminMenuGuiMap( layoutRoot.FindAnyWidget( "Tab_3" ), this ); m_TeleportTab = new AdminMenuGuiTeleport( layoutRoot.FindAnyWidget( "Tab_4" ), this ); m_AboutTab = new AdminMenuGuiAbout( layoutRoot.FindAnyWidget( "Tab_5" ), this ); + m_AboutTab2 = new AdminMenuGuiAbout2( layoutRoot.FindAnyWidget( "Tab_6" ), this ); //m_todo = new AdminMenuGuiTeleport( layoutRoot.FindAnyWidget( "Tab_5" ), this ); //m_todo2 = new AdminMenuGuiTeleport( layoutRoot.FindAnyWidget( "Tab_5" ), this ); @@ -171,9 +171,11 @@ class AdminMenuGui extends UIScriptedMenu { delete m_SpawnTab; delete m_AboutTab; + delete m_AboutTab2; delete m_MapTab; delete m_CommandTab; delete m_TeleportTab; + delete m_PlayerTab; } void SetStatus(string txt) @@ -360,7 +362,7 @@ class AdminMenuGui extends UIScriptedMenu } case 6: { - //m_AboutTab.Focus(); + m_AboutTab2.Focus(); break; } } diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuPlayer.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuPlayer.c index 798d309..bdc68f2 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuPlayer.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/AdminMenuPlayer.c @@ -339,7 +339,7 @@ class AdminMenuGuiPlayer extends ScriptedWidgetEventHandler GetGame().RPCSingleParam( NULL, M_RPCs.M_Admin_Menu_Player_Stamina_Request, new Param1(selectedIdentity.GetName()), false, NULL ); } } - GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( this.UpdateStats, 1500, true ); + //GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( this.UpdateStats, 1500, true ); } @@ -364,6 +364,9 @@ class AdminMenuGuiPlayer extends ScriptedWidgetEventHandler string result; m_PlayerList.GetItemText( m_PlayerList.GetSelectedRow(), 0, result ); return result; + }else + { + GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).Remove( this.UpdateStats ); } return ""; diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_About.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_About.layout index 4653cb7..e0d8464 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_About.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_About.layout @@ -15,7 +15,7 @@ FrameWidgetClass rootFrame { hexactsize 0 vexactsize 0 { - TextWidgetClass TextWidget0 { + TextWidgetClass _Title { position 0 10 size 1 50 halign center_ref diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Commands.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Commands.layout index 27fb91a..9d3f08d 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Commands.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Commands.layout @@ -117,7 +117,7 @@ FrameWidgetClass rootFrame { vexactsize 1 text "Delete Obj on cursor" } - TextWidgetClass TextWidget0 { + TextWidgetClass _Title { position 0 10 size 1 50 halign center_ref diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Main.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Main.layout index af871b6..3a22e53 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Main.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Main.layout @@ -69,7 +69,7 @@ FrameWidgetClass settings_menu_root { GridSpacerWidgetClass Tab_Control_Container { ignorepointer 1 position 0 0 - size 1050 1 + size 1500 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -80,7 +80,7 @@ FrameWidgetClass settings_menu_root { Margin 0 "Size To Content H" 1 "Size To Content V" 1 - Columns 10 + Columns 7 Rows 1 { PanelWidgetClass Tab_Control_0 { @@ -120,7 +120,7 @@ FrameWidgetClass settings_menu_root { ignorepointer 1 color 1 1 1 0.7843 position 0 0 - size 710 1 + size 161.36 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -176,8 +176,8 @@ FrameWidgetClass settings_menu_root { inheritalpha 0 ignorepointer 1 color 1 1 1 0.7843 - position -160 0 - size 710 1 + position -1.87289 0 + size 172.717 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -232,8 +232,8 @@ FrameWidgetClass settings_menu_root { inheritalpha 0 ignorepointer 1 color 1 1 1 0.7843 - position -330 0 - size 710 1 + position -1.51495 0 + size 163.10701 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -255,7 +255,7 @@ FrameWidgetClass settings_menu_root { visible 1 clipchildren 1 position 0 0 - size 170 1 + size 220.437 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -289,8 +289,8 @@ FrameWidgetClass settings_menu_root { inheritalpha 0 ignorepointer 1 color 1 1 1 0.7843 - position -160 0 - size 710 1 + position -1.34311 0 + size 223.33301 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -311,8 +311,8 @@ FrameWidgetClass settings_menu_root { PanelWidgetClass Tab_Control_3 { visible 1 clipchildren 1 - position 0 0 - size 170 1 + position 7.61502 0 + size 162.38501 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -346,8 +346,8 @@ FrameWidgetClass settings_menu_root { inheritalpha 0 ignorepointer 1 color 1 1 1 0.7843 - position -490 0 - size 710 1 + position -0.8492 -0.05504 + size 165.811 0.95827 hexactpos 1 vexactpos 1 hexactsize 1 @@ -403,8 +403,8 @@ FrameWidgetClass settings_menu_root { inheritalpha 0 ignorepointer 1 color 1 1 1 0.7843 - position -160 0 - size 710 1 + position 0.21146 0 + size 169.14101 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -423,7 +423,7 @@ FrameWidgetClass settings_menu_root { } } PanelWidgetClass Tab_Control_6 { - visible 0 + visible 1 clipchildren 1 position 0 0 size 170 1 @@ -437,8 +437,9 @@ FrameWidgetClass settings_menu_root { "no focus" 1 "next down" "XComboBoxWidget1" { - TextWidgetClass Tab_Control_1_Title2 { + TextWidgetClass Tab_Control_1_Title4 { visible 1 + disabled 0 ignorepointer 1 position 0 0 size 1 0.48 @@ -449,76 +450,19 @@ FrameWidgetClass settings_menu_root { hexactsize 0 vexactsize 0 priority 250 - text "Config" + text "WIP" font "gui/fonts/sdf_MetronLight72" "text halign" center "text valign" center } - ImageWidgetClass Tab_Control_1_Background2 { + ImageWidgetClass Tab_Control_1_Background4 { visible 0 disabled 0 inheritalpha 0 ignorepointer 1 color 1 1 1 0.7843 - position -160 0 - size 710 1 - hexactpos 1 - vexactpos 1 - hexactsize 1 - vexactsize 0 - draggable 0 - imageTexture "{5A89D58DD2276E85}Gui/textures/SerratedBlack2.edds" - mode blend - "src alpha" 1 - "no wrap" 0 - stretch 1 - "flip u" 0 - "flip v" 0 - filter 1 - nocache 0 - } - } - } - PanelWidgetClass Tab_Control_7 { - visible 0 - clipchildren 1 - position 0 0 - size 170 1 - hexactpos 1 - vexactpos 1 - hexactsize 1 - vexactsize 0 - priority 200 - userID 0 - style blank - "no focus" 1 - "next down" "XComboBoxWidget1" - { - TextWidgetClass Tab_Control_1_Title3 { - visible 1 - ignorepointer 1 - position 0 0 - size 1 0.48 - halign center_ref - valign center_ref - hexactpos 1 - vexactpos 1 - hexactsize 0 - vexactsize 0 - priority 250 - text "Config" - font "gui/fonts/sdf_MetronLight72" - "text halign" center - "text valign" center - } - ImageWidgetClass Tab_Control_1_Background3 { - visible 0 - disabled 0 - inheritalpha 0 - ignorepointer 1 - color 1 1 1 0.7843 - position -160 0 - size 710 1 + position 0.21146 0 + size 169.14101 1 hexactpos 1 vexactpos 1 hexactsize 1 @@ -686,9 +630,20 @@ FrameWidgetClass settings_menu_root { "text valign" center wrap 1 } + FrameWidgetClass Tab_6 { + visible 0 + ignorepointer 1 + position 0 110 + size 1400 800 + halign center_ref + hexactpos 1 + vexactpos 1 + hexactsize 1 + vexactsize 1 + } } } - TextWidgetClass SettingsTextWidget { + TextWidgetClass _Title { ignorepointer 1 position 0.00178 2.4828 size 1 37.15 diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Map.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Map.layout index 2a0ac07..363a278 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Map.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Map.layout @@ -14,7 +14,7 @@ FrameWidgetClass rootFrame { hexactsize 0 vexactsize 0 { - TextWidgetClass TextWidget0 { + TextWidgetClass _Title { position 0 10 size 1 50 halign center_ref diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Player.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Player.layout index c5cf689..11a6078 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Player.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Player.layout @@ -111,7 +111,7 @@ FrameWidgetClass rootFrame { vexactsize 1 text "Heal Player" } - TextWidgetClass TextWidget0 { + TextWidgetClass _Title { position 0 10 size 1 50 halign center_ref diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Spawn.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Spawn.layout index 1b18668..a2398ad 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Spawn.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Spawn.layout @@ -15,7 +15,7 @@ FrameWidgetClass rootFrame { hexactsize 0 vexactsize 0 { - TextWidgetClass TextWidget0 { + TextWidgetClass _Title { position 0 10 size 1 50 halign center_ref diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Teleport.layout b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Teleport.layout index 5bb4e2e..4cf3231 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Teleport.layout +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/GUI/Layouts/Admin_Teleport.layout @@ -14,7 +14,7 @@ FrameWidgetClass rootFrame { hexactsize 0 vexactsize 0 { - TextWidgetClass TextWidget0 { + TextWidgetClass _Title { position 0 10 size 1 50 halign center_ref diff --git a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/HordeModule.c b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/HordeModule.c index e709b1e..ca5d042 100644 --- a/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/HordeModule.c +++ b/DayZ-Sa-Tomato/addons/DayZ-SA-Tomato/scripts/5_Mission/core/modules/HordeModule.c @@ -50,7 +50,7 @@ class HordeModule { string msg = GetFileHandler().GetConfig("Horde_Message_Location"); int count = msg.Replace("{Location}", name); - GetGame().ChatPlayer(0, msg); + GetGame().ChatPlayer(msg); TL().status(sender, msg); } TL().status(sender, "Horde Spawned at Location : " + name);