From 54c76c199491a609e2a11406c41ce8a5ff9a5cc0 Mon Sep 17 00:00:00 2001 From: vbawol Date: Mon, 9 May 2016 14:54:57 -0500 Subject: [PATCH] 0.3.9.0454 Init weather script at server startup 1= Epoch Events run at server startup and then again after given delay. 0 = Default, runs after given delay. Changed path from \x\addons\a3_epoch_server to \epoch_server to match new build tool prefixes --- Changelogs/0.3.9.0.txt | 9 ++++++-- .../@epochhive/addons/epoch_server.pbo | Bin 394595 -> 394494 bytes .../@epochhive/addons/epoch_server_core.pbo | Bin 19835 -> 12329 bytes .../addons/epoch_server_settings.pbo | Bin 396984 -> 396984 bytes .../@epochhive/epochconfig.hpp | 10 ++++----- .../mpmissions/epoch.Altis.pbo | Bin 961346 -> 961346 bytes .../mpmissions/epoch.Australia.pbo | Bin 959574 -> 959574 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 960661 -> 960661 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 960508 -> 960508 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 960482 -> 960482 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 960489 -> 960489 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 960634 -> 960634 bytes .../mpmissions/epoch.Esseker.pbo | Bin 960474 -> 960474 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 960901 -> 960901 bytes Server_Install_Pack/mpmissions/epoch.Napf.pbo | Bin 961313 -> 961313 bytes .../mpmissions/epoch.Porto.pbo | Bin 960625 -> 960625 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 960636 -> 960636 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 960898 -> 960898 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 960900 -> 960900 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 960903 -> 960903 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 960628 -> 960628 bytes .../mpmissions/epoch.Stratis.pbo | Bin 960482 -> 960482 bytes .../mpmissions/epoch.Takistan.pbo | Bin 960590 -> 960590 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 960474 -> 960474 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 960901 -> 960901 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 960558 -> 960558 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 960621 -> 960621 bytes Sources/epoch_config/build.hpp | 2 +- Sources/epoch_server/build.hpp | 2 +- .../EPOCH_server_loadTraders.sqf | 2 +- .../EPOCH_server_spawnTraders.sqf | 2 +- Sources/epoch_server/config.cpp | 4 ++-- Sources/epoch_server/init/fn_postinit.sqf | 2 +- Sources/epoch_server/init/server_init.sqf | 6 ++--- .../init/server_securityfunctions.sqf | 21 ++++++++++++++++++ .../epoch_server/system/server_monitor.fsm | 6 ++--- Sources/epoch_server_core/build.hpp | 2 +- Sources/epoch_server_settings/build.hpp | 2 +- Tools/Build/build_epoch.bat | 4 ++-- build.txt | 2 +- 40 files changed, 51 insertions(+), 25 deletions(-) diff --git a/Changelogs/0.3.9.0.txt b/Changelogs/0.3.9.0.txt index 408a3feb..d0f5f072 100644 --- a/Changelogs/0.3.9.0.txt +++ b/Changelogs/0.3.9.0.txt @@ -1,7 +1,8 @@ [Added] Player option to Morph into a random antagonist (from deathMorphClass) after death. The array 'deathMorphClass' found in CfgEpochClient can be used to specify what antagonists to randomly spawn. [Added] Player option to detonate body after death. Sacrifice yourself by generating a runaway thermal cascade using the nano bots within your body. Nothing left to revive. -[Added] Server function to allow remote exec of setVariable on client - Allows client to ask another client to set a local variable, via the server. Server can run same function. -[Changed] Moved all Base Building configs to gamemode. + +[Changed] Moved all Base Building variables to gamemode config 'CfgObjectInteractions'. +[Changed] Moved all Item Interaction to gamemode config 'CfgItemInteractions'. [Changed] Sapper groan or detonate can be triggered by setting a variable on the target or sapper. [Changed] Server can be asked by a client / server to trigger an antagonist on another client. Antagonist is then run on target PC, independent from caller of function. [Changed] Epoch Unit Spawn code. Now can be called specifying the target of the antagonist. Antagonist will run on target client PC. @@ -16,13 +17,17 @@ unitTypes - an array of soldier classes to randomly choose from. Custom weapons maxUnitNum - Maximum number of units to spawn per UAV. minAISkill - Minimum value for any AI skill. maxAimingAccuracy -> maxGeneral - Set the maximum value for each available AI skill. A random number between minAISkill and the value for each will be set as that skill. + [Fixed] Getting wet and cold on standing on pier. Thanks to umfufu for the report! http://epochmod.com/forum/topic/41929-getting-10-points-of-wetness/ [Fixed] Missing texture issues with some base building objects since 0.3.8. + [Info] RConPort 2306 added to example-beserver.cfg for changes since A3 1.58. [Info] Removed old .bikey and added new one for 0390. [Info] Requires Arma 3 1.58 or higher. [Info] A big thanks to Isaac, Axeman's chief tester. **Server Only** +[Added] Server function to allow remote exec of setVariable on client - Allows client to ask another client to set a local variable, via the server. Server can run same function. +[Changed] Epoch Events can now self initlize [Info] Changed name of a3_epoch_server to epoch_server. [Info] Changed name of a3_epoch_server_settings to epoch_server_settings. diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server.pbo index 41d86a5222638ae8bad87e6a786a686fe4b27051..aa173fd40a3d2d3f505cb119526bbe4e16049f41 100644 GIT binary patch delta 3620 zcmb7HZEPGz8Gi3>nVV&l&=Q8>~>v4iED6Q^kiMzPOH>dJAB_?%RA+{=1z?rxL4 z-OYa3u^>5GDpd^-)jH^^RYg-Ep#p>wKstmd1&Jbo3TlOfkRVc_f1p43TM(k z#wdTVboSiyyz{&tGxN^)z3YP?J~#OMzV%#x+sgZybDgmM`hmM&zqd8{&fhcV{#gG) zSGMhK9L;U5cX#jk;Xk@QN`8D&klLP(rT?4~h!LH{9cJt9A z^|gVqww?Df=YHK^zca9sbnj-){i*)R!RgJ*zHSsJ#t)4jO$UF8#TUNVv#rsyEw=n_ zW6gPC$%cpcCXRTOJLC}W8;WLC zZ3+-XfMv(>?Hb&Tqmn?DRTtNMA<+a3%cAggJ+NVsphzHQr<Efg`3AtHF^I|^3*VH(%F7!E%z z;O{CA)?kXpRIg}~3y(G-T6ne0V2%*kK}6&^LFcPA{Rzp~z;kmp?AsS49IrWp@OEnG zB_ir}FP=L?vZ1;2VE~SV)0T?xEB}K(M%(Qg2j!sP8HD&HAxa{OA?hG1z>~&a#4`n+ z7Vt!Xhb>|h;Q2QOd9O9btrR?B~anEHhW zdUwMG9MVM(!W=lo(GbVWzxx-lo(cG;Bv-+l42HdV?cg+gcpqX_$2aXMyf#6hSLynV z!8SgO4`s(^TXZP{Ce|Uk{Cr zjUMLjUceWm>U$N-!M7cFdX>>ZzN; zu=#@sck12|Yx&}wZx|zsEpTaR1Whb=@6yrElwL}IVkr2`me`Kq@-5||;A^*(6MGg* zmQz)|#l87(m!-&8W2NN8y!9gN*kb_Zu}D}CDuNb}B} z{#<9Oz1`R64aV#=7ALszxYBrd{-+dFioXjHmr7{-Vz=`qr7+ zka4u>vviRL>-&|SiT^Ka)iA8p`{cd7y}&7S8GIEh5Wjl#*|Qm?aW<3usTa>I1?sJ2 ze=vG0`B6t&caLB8RRb$A7F>QcxuY?2JDE(yJ5!ChJIUBW@0W(Je)E;=-(G(qIQF~U N-}<(4ZTpV*{tM_W-dg|w delta 3922 zcma)9-)|IE6mGk_gk9LSw3Kc^VOW%3DcfyJX$Wbw-4>}7x}l{Tp}5}8+}#~JJ2TAO z-P%;MiJBPoMKdNt#0N=KBqS;!W)n$F_ybI=36ClY`YOI?42kjFxie*FcDC4L+w|P; zp8K8eoO|xsf8UPXdnfkZ!LhN)ne3<_DDtG7QxXMLZL0mb^+hr>4u*x2C<%3|e@*pe zqD}9c1I8acn{T|i+GgC11e@<0=h{;n?yRS$>BnAA9iKtcQ-YeJN5;38%y2M4PCtlGJkd&?{t?#1DU;< zRU;G|pXMc`>zpfuXk;ZC38NAzDB4IoehmI0ViBu|U&O*ly#Mf#f#IXcfuVl7^csAu z&_)gq4IbkRv~u>1Yq9FJSo6Z&&9BTOs*6642D9c*tu4LP;eVR1cDd|TuooXbu}747 zsU%=7?&3lPi<`SH2M0{`a`4GiG?G%(WlhW%2)93VfE!5m4{?XM(KDw;xj}9sJ)Jti zothr!&QGWcUpS=*30^5);P#i3iNQoN(SINsF;_1Khp4w$r7s$ZM)n9eC(4-1QYTqz zVVb0J`7|PY0qY#qgBeE$vzU6$>R2md%~}bUWRd9SFK{E=3Y8-qUcyL)uxm{kzE~19 zEX-j|7Zn+>$wZ~!LOV-V4cVLGo`bTyqTzV&BQvkaIWf;Hj0;dAM3nP-oRN5>=vwK; zfgD|=ABd*{ndfu)<0Y9Vz)5F`cLJRN@CuEFpghoxTjE;PU~6GXoSm_Rpg0R0&WRGH z@cG*0*J?H|f?SrLxv=etTBrxxMOfAFB$&VrQ^+C>%Z!?;=n$u82iTk~X11fbr^2w1 zL`KjPB;?LcgLT6Hi23nxL8Yk>Jd@~I=8^@T*OZdVYQ>JhPFYFKYe>M)v2~U=8)1AI zidCF~a_{0bjEL_h+pT~lye>eL%Ob&P2`$qaX6LfswX_#{k#1MNqrHyGc#L*3C^ToI zL-=CL)&_*v+2s~u?Cj*!xW})J&~Q~mbMt5Gv$fUe21p7L)^h+|nqTw$5Lab*JvcWdb~FCnT|lc@x_k7_TwIx zRP3xxzZMU?L9}9Tir`l^{f_N)1n1t=uzV;dX^urPB*9W8PDG70wRG&Y3k*xG$a!uoKr9U=3YxT^b{-8=#$pjI2Eu73Z>o;z&wK z7|C>S@XI6{0%qZ*rw@)lhS;mVol(Q2q{%63j&!zHTz5336pKh+=P4_SI#t=-XJ%NR zVf_3=b~Hw!Hm)gZN`vNR6IhGiR+*M7FeLDDKN?hQj;?b?nJ*`f`YwRLNnVjfow(WB z2NC#6k;mGRi87WOh*6d7Fgsb5Fgkb#F|nZQ7J4{jgeJ8&>Tv z3C=t&Qcf^Z)9)}x6UjKeBy9foS_@*?8orZ>p+tXTIBs6-Xr43D?*^;g-GPlk_ZP2S zI|3hVa+ypp^%$4BqvkJr1BdFDs{8f@K5KQ^tKSU;PX7JYgT7$(L0{-5*^on$jxU(W ztD&x|-+U5kHn&_4?X2GaG!%%KtuKY-YUZnuF}w913BB<3EddqNcP>5r{o@apK7T#* EABY;$i~s-t diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_core.pbo index 56b9970234c68560b49095f73659e6cd464007e1..c703b025eb8838ebf9632ceb841acbecacc50360 100644 GIT binary patch delta 738 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 Bh-m-- diff --git a/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo b/Server_Install_Pack/@epochhive/addons/epoch_server_settings.pbo index b2e7dc6498ee60a1fe6c61b00f8f61fc94f95590..d7318d4ac60385472dbec781aa54a08c941edb37 100644 GIT binary patch delta 150 zcmdlnS7OIpi3x%BRj&-fT^JY`l1ejkQuHzk3V>_`s07OL0=dcgd1;yHddXhAk5SU@Y6>>oEOMV&d*EBOxH_BlRmI+ z};^vkHMy6&;*1TM`Knym?*2L7fxrn{Jh@BCLnShuXh*^M`b$byzn-RN6a5dk~ VNv4?s@9g!tClyZee)HI%5CC6yD3bsH diff --git a/Server_Install_Pack/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp index befcdd93..6ebd741f 100644 --- a/Server_Install_Pack/@epochhive/epochconfig.hpp +++ b/Server_Install_Pack/@epochhive/epochconfig.hpp @@ -12,11 +12,11 @@ lootMultiplier = 0.5; // 1 = max loot bias. This controls how much loot can payo // Events WeatherStaticForecast[] = {}; // Default: {75.5,0,{0,0,0},0,{1,1}}; // Clear day; {19,1,{1,1,40},1,{5,5}}; // Cold Foggy Rainy Overcast Windy; Format: {temp ,rain ,fog ,overcast ,wind } events[] = { - { 3600, "CarnivalSpawner" }, // SECOND , EVENT - { 2400, "EarthQuake" }, - { 1800, "ChangeWeather" }, - { 1200, "ContainerSpawner" }, - { 300, "PlantSpawner" } //No comma on last Entry + { 3600, "CarnivalSpawner", 0 }, // SECOND , EVENT , INIT (1 or 0) 1 = run script at startup, 0 normal delay + { 2400, "EarthQuake", 0 }, + { 1800, "ChangeWeather", 1 }, + { 1200, "ContainerSpawner", 0 }, + { 300, "PlantSpawner", 0 } //No comma on last Entry }; // Antagonists diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index a3bc09fe4d9eb67064e249924f42f146796a68d5..762273bbe2ec6ab1d3c6b846d04dd8c2abfdfa08 100644 GIT binary patch delta 152 zcmX?f&FauKs|jXI^{+Ns=rXc(Z8r$NATU{xQEhTX9M9&tj0a7aYhM{GPBi0UvoJ6< zH8pHbcW6&{U<6_&AZ7+)79eKbp6V3Dcd@|c+&4`f8$2ZPzT=4|}VFW(W delta 152 zcmX?f&FauKs|jXIhu3Yi&}C$sqRbqAL13~XquS((IG)XO84sE;|Mk&doM^_yW^QR< zWNO)*?$Dm@zzD=lK+FupEI`b7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jtq$H^ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index 1290d0f77cf1bd1cc4d20729d29c1fdcaf05443f..5221aa3a209124d14930ba6a43e8bc71c2c3ede2 100644 GIT binary patch delta 148 zcmcb1!s^-ys|jXI&963E=rXc(Z8r$NATU{xQEhTX9M9&tj0a7aYhM{GPBi0UvoJ6P zg64FG_H+kEAZ7w$W*}w(V%F{H4s8EYnN6$}rYBZ0IZvOknN6qt`Z6{kW(Q&pAm#*O nE+FOxVxH~Sm+@x*70E4r8xqj_D*qar@H_>nyI-B^lNSR3f_6M> delta 148 zcmcb1!s^-ys|jXI$JcGN&}C$sqRbqAL13~XquS((IG)XO84sE;|Mk&doM^_yW^QR< zWM7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul pK+FZi+(68;{rWQA?7t%0Pgh?woy*WHt*8F6dFsF0Z$)260{|hnJfQ#p diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index 1b18d80540d273b4a4305454297a7bc5ada141d2..eb7c3d8006fec70d801e7d8593a19561c6112af9 100644 GIT binary patch delta 151 zcmbPw(Q4{Ns|jXIZLc<3=rXc(Z8r$NATU{xQEhTX9M9&tj0a7aYhM{GPBi0UwJ zHEm9FXisxs1Y#y2W(HywAZFd3=D_wpmD$8vVR~W}lk@Zmo7r^QuP zHET|DXisxs1Y#y2W(HywAZFd3=D_wpmD$8vVR~W}lk@Zmo7r^QuPv-HG?r^#uU@aXb0| diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 36c18b4b9427354333e2db265d25ec95ca7e6ed8..136545741469fe9427b3d526a46c0399360f1a18 100644 GIT binary patch delta 151 zcmaEK-s;hLs|jXIy{|S}=rXc(Z8r$NATU{xQEhTX9M9&tj0a7aYhM{GPBi0UvoJ6< zH8X8acW6&{U<6_&AZ7+)79eKbp67xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul qK+FZi+(66&#Jtn5FXQ_zA}I3VvEt8Phm5`L-TpDN7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul qK+FZi+(66&#Jtn5FXQ_s^7z(M(}VS^H+Nru_+_tj81uX7PdxyM^Fa~- delta 151 zcmaEP-s7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul qK+FZi+(66&#Jtn5FXQ_s5^uS8vc-Rc#D8al_kLq(W?i{lza9VpFg?8h diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index fa1901b611aa38e0d206ba2080f8526a4814c189..e444477eb2a4028e0afd6a66c1b78b1323f49894 100644 GIT binary patch delta 152 zcmex$!Rprqs|jXIQ(kSf&}C%n+HMejL13~XquS((IG)XO84sE;*S<1XoM^_yW?^7z zYHrk=?$Dm@zzD=lK+FupEI`b7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul qK+FZi+(66&#Jtn5FXMYJa?f)6DyAd0ne!_jXcUL+O*)ZPl??z_Fg{uU delta 151 zcmcb0-s;wQs|jXIkJfFp&}C$sqRbqAL13~XquS((IG)XO84sE;|Mk&doM^_yW^QR< zWNFZx?$Dm@zzD=lK+FupEI`b7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul pK+FZi+(66&#Jtn5FXMYJk|zJE%suf_o4Z)VL5DXAc{`Gmg8=4AJd*$b diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index a98862e59a8dc42d4f7fc860cf99b3167494ed7f..2696ff443f3ccb3a3d049c5d90456b5151aed53b 100644 GIT binary patch delta 152 zcmZp@Y}I<%YJwTl>{lBtbQ#&Ywi|?B5SXmUs5ZGGj%V{+#)BrzwXX~oCz^4wSs0j_ znp-xfJG7@eFaj|X5HkZY3lOtzPj_JZm&$BntuQ^YiphEUgw1R^?bnyF0Wmuea{w_X q5OV=BHxTmxG4J;4%lKw7i4;Xu@V~iypXpO5@5%CBw|jCCdN}|m{5;eE delta 152 zcmZp@Y}I<%YJwTl^K~07bQ#&EC^Ls&5SXmUs5ZGGj%V{+#)Brze|_{9Cz^4wnOhnd zS(-MdJG7@eFaj|X5HkZY3lOtzPj_JZm&$BxtuQ^YiphEUgw1R^?bnyF0Wmuea{w_X r5OV=BHxTmxG4J;4%lKw7iKtg5Z18V+UHA9in&SEEj@<7!qSyie(eFNr diff --git a/Server_Install_Pack/mpmissions/epoch.Napf.pbo b/Server_Install_Pack/mpmissions/epoch.Napf.pbo index 19b8b28e167046ae676ae476fadf6d3e6500656f..eb511e13f38deebe74668b5a009e3e9d836718cd 100644 GIT binary patch delta 152 zcmZ2@&1&H_s|jXI^IvVW&}C%n+HMejL13~XquS((IG)XO84sE;*S<1XoM^_yW?^7z zYGK@*?$Dm@zzD=lK+FupEI`b7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt%`bnmxAT@2cYpMS1~mWxHncp> delta 152 zcmZ2@&1&H_s|jXIZ`N(J&}C$sqRbqAL13~XquS((IG)XO84sE;|Mk&doM^_yW^QR< zWNF!)?$Dm@zzD=lK+FupEI`b7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt7xrUn;Y)wZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jtw~$$9#O&1^dD*O##YF*^`*05K;J qa{)0o5c2>r@Am7<_@*<7Xx!J<@#ybTGP<+nX?D?w~$$9#O&1^dD*O##YF*^`*05K;J qa{)0o5c2>r@Am7<_@*<7ykB?XcrQoa?~lTN>VB^gsAfB1R0#mPwmtj+ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index 3f9ed66d89810881132008b677803db43a6ebade..c3bd6d9b7839ee9353ab8597bed37efcf8c53941 100644 GIT binary patch delta 152 zcmZp7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jt8tN7JZzErsm~Jtqeoo^Fx3?be@|FVtyHY%a diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index f299cc85edc35251ca8e59a941310fbd4cca7fab..3179544e1db945e880281e3d1deb16874a695435 100644 GIT binary patch delta 151 zcmaEK-s;hLs|jXI+h1+8&}C%n+HMejL13~XquS((IG)XO84sE;*S<1XoM^_yW?^7z zW?7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul qK+FZi+(66&#Jtn5FXQ_zl6GTBL%{)ukf2QC7Ul&HU-oNp%>V#xOFiuX delta 151 zcmaEK-s;hLs|jXIJnJ`F=rXcRQDzRmATU{xQEhTX9M9&tj0a7a|N7`JPBi0UGq*G_ zHa2QbcW6&{U<6_&AZ7+)79eKbp67xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#JtVtitI04`6<$=v*>w~`1;B7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul qK+FZi+(66&#Jtn5FXMYJ5)}O4d(y%*QNhxtxiQrr&-?8D>kR;GTt5c@ delta 151 zcmcb0-s;wQs|jXIlIu5G=rXcRQDzRmATU{xQEhTX9M9&tj0a7a|N7`JPBi0UGq*G_ zHZg5ZcW6&{U<6_&AZ7+)79eKbp6{{u{9C@{=<&}KV|1;6-M@s=+>^#Q+ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index 2dd4fc205b6cf38de0df7d05228bbb3607cc00ce..52db2912ca9bbe2a14faee79b8ca2115c5da0833 100644 GIT binary patch delta 152 zcmZ2?!D`(Fs|jXICtq!}&}C%n+HMejL13~XquS((IG)XO84sE;*S<1XoM^_yW?^7z zW@Or&?$Dm@zzD=lK+FupEI`b7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#JtiUcv~Zai7xrUn;YSwZinoDkkUY6E?Hyv|nGw2E^<@%mKul rK+FZi+(66&#Jtd1e~`uQEQ< delta 152 zcmaER!RqY=s|jXIqU$$W=rXcRQDzRmATU{xQEhTX9M9&tj0a7a|N7`JPBi0UGq*G_ zHZg2YcW6&{U<6_&AZ7+)79eKbp6_*iU`~8G_E~0A^YC0puEVaxWD!rZm0tQx-C3y diff --git a/Sources/epoch_config/build.hpp b/Sources/epoch_config/build.hpp index caca6599..e01c73d7 100644 --- a/Sources/epoch_config/build.hpp +++ b/Sources/epoch_config/build.hpp @@ -1 +1 @@ -build=453; +build=454; diff --git a/Sources/epoch_server/build.hpp b/Sources/epoch_server/build.hpp index caca6599..e01c73d7 100644 --- a/Sources/epoch_server/build.hpp +++ b/Sources/epoch_server/build.hpp @@ -1 +1 @@ -build=453; +build=454; diff --git a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf index 5eb1940e..5220b5d1 100644 --- a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf +++ b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf @@ -142,7 +142,7 @@ for "_i" from 0 to _maxTraderLimit do { _agent addEventHandler ["Killed", { _this call EPOCH_server_traderKilled; }]; if !(EPOCH_forceStaticTraders) then { - [_agent, _home, _work] execFSM "\x\addons\a3_epoch_server\system\Trader_brain.fsm"; + [_agent, _home, _work] execFSM "\epoch_server\system\Trader_brain.fsm"; }; _agent setVariable ["AI_SLOT", _i, true]; diff --git a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_spawnTraders.sqf b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_spawnTraders.sqf index 286c39f7..f900844b 100644 --- a/Sources/epoch_server/compile/epoch_traders/EPOCH_server_spawnTraders.sqf +++ b/Sources/epoch_server/compile/epoch_traders/EPOCH_server_spawnTraders.sqf @@ -76,7 +76,7 @@ for "_i" from 1 to _spawnCount do { _agent addEventHandler["Killed", { _this call EPOCH_server_traderKilled; }]; if !(EPOCH_forceStaticTraders) then { - [_agent, _home, [_work, _schedule]] execFSM "\x\addons\a3_epoch_server\system\Trader_brain.fsm"; + [_agent, _home, [_work, _schedule]] execFSM "\epoch_server\system\Trader_brain.fsm"; }; ["AI", _objHiveKey, [_randomAIClass, _home, [_work, _schedule]]] call EPOCH_fnc_server_hiveSET; diff --git a/Sources/epoch_server/config.cpp b/Sources/epoch_server/config.cpp index 438cda74..423ee82f 100644 --- a/Sources/epoch_server/config.cpp +++ b/Sources/epoch_server/config.cpp @@ -20,7 +20,7 @@ class cfgFunctions tag = "EPOCH"; class Epoch_Server { - file = "\x\addons\a3_epoch_server\init"; + file = "\epoch_server\init"; class init { preInit = 1; @@ -38,7 +38,7 @@ class CfgServerFunctions class A3E { tag = "EPOCH"; - file = "\x\addons\a3_epoch_server\compile"; + file = "\epoch_server\compile"; class epoch_group { class server_upgradeGroup {}; class server_updatePlayerGroup {}; diff --git a/Sources/epoch_server/init/fn_postinit.sqf b/Sources/epoch_server/init/fn_postinit.sqf index 4749f152..14d6197f 100644 --- a/Sources/epoch_server/init/fn_postinit.sqf +++ b/Sources/epoch_server/init/fn_postinit.sqf @@ -16,7 +16,7 @@ if (isNil "Epoch_SStart") then { Epoch_SStart = true; [] spawn { call compile preprocessFileLineNumbers "epoch_code\init\both_init.sqf"; - call compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\init\server_init.sqf"; + call compile preprocessFileLineNumbers "\epoch_server\init\server_init.sqf"; }; }; diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf index ca5d2f12..91d33783 100644 --- a/Sources/epoch_server/init/server_init.sqf +++ b/Sources/epoch_server/init/server_init.sqf @@ -63,8 +63,8 @@ if (EPOCH_modCUPVehiclesEnabled) then { }; diag_log "Epoch: Init Variables"; -call compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\init\server_variables.sqf"; -call compile preprocessFileLineNumbers "\x\addons\a3_epoch_server\init\server_securityfunctions.sqf"; +call compile preprocessFileLineNumbers "\epoch_server\init\server_variables.sqf"; +call compile preprocessFileLineNumbers "\epoch_server\init\server_securityfunctions.sqf"; ["I", _instanceID, "86400", ["CONTINUE"]] call EPOCH_fnc_server_hiveSETEX; diag_log format["Epoch: Start Hive, Instance ID: '%1'", _instanceID]; @@ -163,7 +163,7 @@ EPOCH_StorageSlotsLimit call EPOCH_load_storage; diag_log "Epoch: Loading static loot"; call EPOCH_server_spawnBoatLoot; -[] execFSM "\x\addons\a3_epoch_server\system\server_monitor.fsm"; +[] execFSM "\epoch_server\system\server_monitor.fsm"; // Setting Server Date and Time _dateChanged = false; diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf index 3db1750e..478519ba 100644 --- a/Sources/epoch_server/init/server_securityfunctions.sqf +++ b/Sources/epoch_server/init/server_securityfunctions.sqf @@ -257,6 +257,27 @@ EPOCH_server_disconnect = compileFinal(" _ret "); +EPOCH_server_movePlayer = compileFinal(" +params [['_playerObj',objNull,[_playerObj]],'_pos']; +if !(isNull _playerObj) then { + "+_skn_antiTeleportPVC+" = true; + (owner _playerObj) publicVariableClient '"+_skn_antiTeleportPVC+"'; + [format['Teleport %1 (%2) To Position: %3', name _playerObj, getPlayerUID _playerObj,_pos], 0] call "+_skn_server_adminLog+"; + [vehicle _playerObj,_pos] spawn { + uiSleep 0.5; + (_this select 0) setPosATL (_this select 1); + }; +}; +"); + +EPOCH_server_teleportCheck = compileFinal(" +params [['_playerObj',objNull,[_playerObj]],'_allow']; +if !(isNull _playerObj) then { + "+_skn_antiTeleportPVC+" = _allow; + (owner _playerObj) publicVariableClient '"+_skn_antiTeleportPVC+"'; +}; +"); + _stringInArray = { private "_ret"; _ret = false; diff --git a/Sources/epoch_server/system/server_monitor.fsm b/Sources/epoch_server/system/server_monitor.fsm index 179e9ced..8cb5c289 100644 --- a/Sources/epoch_server/system/server_monitor.fsm +++ b/Sources/epoch_server/system/server_monitor.fsm @@ -385,12 +385,12 @@ class FSM action=/*%FSM*/"// Epoch Events" \n "_pvehTime = diag_tickTime;" \n "{" \n - " _x params [""_time"", ""_scriptName"", [""_runAtStart"",false]];" \n + " _x params [""_time"", ""_scriptName"", [""_runAtStart"",0]];" \n " _eventKey = format[""EPOCH_EVENT_%1"", _forEachIndex];" \n " _lastTime = missionNamespace getVariable _eventKey;" \n " if (isNil ""_lastTime"") then {" \n " _startTime = diag_tickTime;" \n - " if (_runAtStart) then {" \n + " if (_runAtStart isEqualTo 1) then {" \n " _startTime = diag_tickTime - _time;" \n " };" \n " missionNamespace setVariable[_eventKey, _startTime];" \n @@ -452,4 +452,4 @@ class FSM { }; }; -/*%FSM*/ \ No newline at end of file +/*%FSM*/ diff --git a/Sources/epoch_server_core/build.hpp b/Sources/epoch_server_core/build.hpp index caca6599..e01c73d7 100644 --- a/Sources/epoch_server_core/build.hpp +++ b/Sources/epoch_server_core/build.hpp @@ -1 +1 @@ -build=453; +build=454; diff --git a/Sources/epoch_server_settings/build.hpp b/Sources/epoch_server_settings/build.hpp index caca6599..e01c73d7 100644 --- a/Sources/epoch_server_settings/build.hpp +++ b/Sources/epoch_server_settings/build.hpp @@ -1 +1 @@ -build=453; +build=454; diff --git a/Tools/Build/build_epoch.bat b/Tools/Build/build_epoch.bat index 30c6a925..2e7e9797 100644 --- a/Tools/Build/build_epoch.bat +++ b/Tools/Build/build_epoch.bat @@ -80,7 +80,7 @@ echo building server pbo echo build=%BUILDNUMBER%; > !serverBuildInc! SET SOURCE_PATH=%MAIN_PATH%\Sources\epoch_server SET OUTPUT_PATH=%MAIN_PATH%\Server_Install_Pack\@EpochHive\addons -SET TEMP_PATH=x\addons\a3_epoch_server +SET TEMP_PATH=epoch_server rd /s/q P:\!TEMP_PATH! xcopy /s/e/y/q/i "!SOURCE_PATH!" P:\!TEMP_PATH! START "" /min /WAIT "!TOOLS_PATH!\AddonBuilder.exe" "P:\!TEMP_PATH!" "!OUTPUT_PATH!" -clear -prefix="!TEMP_PATH!" -project="P:\!TEMP_PATH!" -include=!AB_includes_path! @@ -94,7 +94,7 @@ echo building settings pbo echo build=%BUILDNUMBER%; > !settingsBuildInc! SET SOURCE_PATH=%MAIN_PATH%\Sources\epoch_server_settings SET OUTPUT_PATH=%MAIN_PATH%\Server_Install_Pack\@EpochHive\addons -SET TEMP_PATH=a3_epoch_server_settings +SET TEMP_PATH=epoch_server_settings rd /s/q P:\!TEMP_PATH! xcopy /s/e/y/q/i "!SOURCE_PATH!" P:\!TEMP_PATH! START "" /min /WAIT "!TOOLS_PATH!\AddonBuilder.exe" "P:\!TEMP_PATH!" "!OUTPUT_PATH!" -packonly -clear -prefix="!TEMP_PATH!" -project="P:\!TEMP_PATH!" -include=!AB_includes_path! diff --git a/build.txt b/build.txt index fafef07e..566751b8 100644 --- a/build.txt +++ b/build.txt @@ -1 +1 @@ -453 +454