From a8ed5dda28e712855b033dde0db936f8f98f25ba Mon Sep 17 00:00:00 2001 From: vbawol Date: Wed, 3 Feb 2016 10:45:18 -0600 Subject: [PATCH 1/3] further improve wait logic for player object propagation. use loadAbs instead, thanks to norukid on the forums! --- .../@epochhive/addons/a3_epoch_server.pbo | Bin 389074 -> 389065 bytes .../mpmissions/epoch.Altis.pbo | Bin 89670 -> 89655 bytes .../mpmissions/epoch.Australia.pbo | Bin 89722 -> 89707 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 89834 -> 89819 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 89687 -> 89672 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 89788 -> 89773 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 89844 -> 89829 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 89802 -> 89787 bytes .../mpmissions/epoch.Esseker.pbo | Bin 89676 -> 89661 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 89991 -> 89976 bytes .../mpmissions/epoch.Porto.pbo | Bin 89794 -> 89779 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 89882 -> 89867 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 89953 -> 89938 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 89968 -> 89953 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 89976 -> 89961 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 89818 -> 89803 bytes .../mpmissions/epoch.Stratis.pbo | Bin 89710 -> 89695 bytes .../mpmissions/epoch.Takistan.pbo | Bin 89733 -> 89718 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89646 -> 89631 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 89930 -> 89915 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 89871 -> 89856 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 89770 -> 89755 bytes Sources/epoch_code/System/player_login.fsm | 4 ++-- .../epoch_player/EPOCH_server_loadPlayer.sqf | 2 +- .../epoch.Altis/System/player_login.fsm | 4 ++-- .../epoch.Australia/System/player_login.fsm | 4 ++-- .../System/player_login.fsm | 4 ++-- .../epoch.Bornholm/System/player_login.fsm | 4 ++-- .../epoch.Chernarus/System/player_login.fsm | 4 ++-- .../System/player_login.fsm | 4 ++-- .../epoch.Desert_E/System/player_login.fsm | 4 ++-- .../epoch.Esseker/System/player_login.fsm | 4 ++-- .../System/player_login.fsm | 4 ++-- .../epoch.Porto/System/player_login.fsm | 4 ++-- .../System/player_login.fsm | 4 ++-- .../epoch.Sara/System/player_login.fsm | 4 ++-- .../epoch.SaraLite/System/player_login.fsm | 4 ++-- .../epoch.Sara_dbe1/System/player_login.fsm | 4 ++-- .../epoch.Shapur_BAF/System/player_login.fsm | 4 ++-- .../epoch.Stratis/System/player_login.fsm | 4 ++-- .../epoch.Takistan/System/player_login.fsm | 4 ++-- .../epoch.VR/System/player_login.fsm | 4 ++-- .../System/player_login.fsm | 4 ++-- .../epoch.Zargabad/System/player_login.fsm | 4 ++-- .../epoch.utes/System/player_login.fsm | 4 ++-- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo b/Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo index 587319a858532324aa6fe327bd892fd47960b527..7fa7cd33b589a0d3c6b34766c2dc2248f994642c 100644 GIT binary patch delta 116 zcmca~U;N~K@eS`e+0ryOg)P^fe346KI`2^?vCaBi+qjtdv^F)r5ZV4hgmFHvKu&&Q ziepl-LVR9oc|cBOQTqZV#_bD~m}>giOe{?eO%2+WHZlP*GZ3?ESK7!r$4;c&(kb>u U`TjM3_~Y0ej;xp%Ar-g_05)hWL;wH) delta 125 zcmX?kU;NU2@eS`e+2T&G3EQAO`68Ff^sXaJLYuX@c5yLFoLSTSLS*|35yttvlF9j{ zc_kXTiRp<|nR%(j3h{ZV2`{HZe47m)yt%#LPgl{0gf~4%8MLBZnex0rTFWqfCBORV!0RV=YF&zK^ diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 7a1f66960076b5c967ea30c8086b9e2eb45807f7..ec50e14e50f92429cf75abcf7a62ba0d9a05fd40 100644 GIT binary patch delta 91 zcmX@MhjsfN)(Kmg4{2_ixI>Y5_EQEh*r2&7YWE7;m9XyoK4rZ^^T u|D(Z}tjAPbJY6u7QGI()IO8%lk-k#@Cp&Mr8)scS+G`g*OQlum>)*{h JY-hvw0stPPE*}5@ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index a1ffb1e87725fd0e8e98a7c5b43835f8062848e2..a2cadf53aea0a478085b93c116c9765cc730512f 100644 GIT binary patch delta 95 zcmeyhhxPRy)(Kmg4{2_ixI>Y5_EQEh*r2&7YM!4G;;D2Qyi1F z8)z~n>oFAs5{y2I>+{N;fyobMD7Z+y-L@L)N9|k^Ozah-4b{&2<_Y$6$kDWA{9_g9s0pIrXGw&Ba` HlCFCIw~j8f diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index 62746bbfc73543c251baef032f224e74b56ebc49..7081e073b2834c52ad0236860edc34fb30d8e212 100644 GIT binary patch delta 95 zcmaF0m-Y5u)(Kmg4{L6kxI>Y5_EQEh*r2&7YoE7;m9XyoK4rZ^^T yU!cjDtjAPbJl!#ZQFrpX>m1wdA{b||iEMnnviUd5n{avWDRI3$_Se#7n1TTufhA}F delta 109 zcmcb;m-W?N)(Kmg7aw0gafc%Bs;3NKF!T8OuvLxEwmxHAq#=>+oL`z(qF`&QkPKpI zY5_EQEh*r2&7YM!4G;;D2Qyi1F y^J+3C>oFEj7YJw6n9di$$hLiPIO75~k&wol+q^m^?pbwO+2*fI{x+Yp3k3nBP$Rbh delta 106 zcmX@HhxPg%)(Kmg7aw0gafc%Bs;3NKF!T8OuvLxEwmxIz*N{ke&M(a?QLwdDNCq)9 zaud@Nt1|Oaw=-!nChM_5q^HjhXVl$3C7f{qo5)es&}sjR0&jg~?)2>2IZsP0At@dJ D_+~0J diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 25c21eb62dcecd4363c3b220f5f2d4af3f34df04..4eba012f4a2208715a3ea9a9ec590bf497c56f8b 100644 GIT binary patch delta 91 zcmdn9mv!x4)(Kmg4{L6kxI>Y5_EQEh*r2&7YM!4G;;D2Qyi1F u7ilsk>oFAY5_EQEh*r2&7YItjAPbJbiy8qxyEM2*zb>B0g>0EsLzT^tIgFF=@w!D~-)JY5_EQEh*r2&7YM!4G;;D2Qyi1F yH)t{@>oFAY5_EQEh*r2&7YM!4G;;D2Qyi1F uGifp=>oFAx8Y$M>RK1+@Z)j`zZq$Y|z{kHoNiJ)@O|Nn!Lru3bwWi8aeriDUM0o yZM7Ja^%#q%J47&QOt*_Z0sg^_Xd0~k*TF)-~D40kDhuM7a1Q6X3W delta 106 zcmeydkF|Y2>x8Y$OOLOgxI>Y5)l&vAn0b7C*s8{7Tc0u7Yf7X$=a=S{DA?L6B!d_l zxrynCRhfCI+l{msll9mj($mjJFzRkU62Z8DO~n6LV3=InW4&DrqP0#c;gZG+4jKUf D^gbxJ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 8c3ce62f4d2bd2d7e56439bd38d422e2e9aa1070..a9e6327b8335e1f77364e7b62a9a3ab1f5d909a4 100644 GIT binary patch delta 86 zcmX@Kmv!@A)(Kmgk7{n3xI>Y5_EQEh*r2&7YM!4G;;D2Qyi1F pS7oFAZ1|yZv7+d6%xA9mW}R?(gBrsQ}6MBUJzZ delta 106 zcmdnIm-WzI)(KmgmmXg~afc%Bs;3NKF!T8OuvLxEwmxI5(vV1Z&M(a?QLwdDNCq)9 zaud@Nt1|Oax94gyChM_5q^B2#GpcX@8P2$jP2`c(N;j@Mo2O)Ev3q;QKb*dqnZXx8Y$$22!h+@Z)j`zZq$Y|z{kHoNiJ)@O{DGM!4G;;D2Qyi1F zU(jSs)?+Fzo?aNis5|-Ib&lx8Y$%Z{&~xI>Y5)l&vAn0b7C*s8{7Tc0sr(vV1Z&M(a?QLwdDNCq)9 zaud@Nt1|Oaw;$DHOx9xsOHZE|&Zsf@#&y2!@ezzO*hFHAx&?|~&dxYIYvYH-PgZ)V IykC0=0JFm{6aWAK diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 0e09cb9786b3ea23d06f7d1a25a935a153a4864e..04ac89f7c3c647105017b23e3096a62a417edaac 100644 GIT binary patch delta 91 zcmaF3kM+_%)(Kmgk7;h2xI>Y5_EQEh*r2&7YM!4G;;D2Qyi1F ui)%3^>oFAY5_EQEh*r2&7YM!4G;;D2Qyi1F tt7$PN>oFAY5_EQEh*r2&7YM!4G;;D2Qyi1F z>uE72>oFEjH;iD^n64km$Tr#L2FLa@5sWj~M7YCZe@tJ$*IMMYZnj0icI{7A(PjWx CbtKFH delta 110 zcmaF4kM+ks)(Kmgmmgn0afc%Bs;3NKF!T8OuvLxEwmxGt(3D7b&M(a?QLwdDNCq)9 zaud@Nt1|Oaw<~KgChM_5q^BQqFTV8Im+eY HQFRLd(^V^z diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 0f7145ab759de45b7a1accdea018905aba247425..a7644b285d7e0f21dd560d81227b4917d9ade1a2 100644 GIT binary patch delta 95 zcmcb$m-X~s)(Kmgk85t4xI>Y5_EQEh*r2&7YoE7;m9XyoK4rZ^^T zpPm1wlA{b||iG)50*d4V$NnDpTLFd@DoTe!nvrhm3@slLc delta 109 zcmX@Tm-W_O)(Kmgmmgn0afc%Bs;3NKF!T8OuvLxEwmxH=q#=>+oL`z(qF`&QkPKpI z)tj0IRYrp8x;= diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 136e28719e4e07626796a0d8868dcb647f2e448f..8676ae443d09cb02b1e597f45ae5f4d15235fc82 100644 GIT binary patch delta 91 zcmaF2hxPs*)(Kmgk85t4xI>Y5_EQEh*r2&7YM!4G;;D2Qyi1F vt7tMN>oFAsRlIFm{Zu?4i`g3h DAUrDC diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 53af8db1281ce4a585e45ef769535875f64fb18c..94e761ec2103a2e32cebd51b3331f1b3f19c5b18 100644 GIT binary patch delta 91 zcmZqO%ld5(>x8Y$Cp0%r+@Z)j`zZq$Y|z{kHoNiJ)@O{i8ob5D3bwWi8aeriDUM0o utu+~w^_Yr_rw2qbs&79X&bW+Cgfm=0x8Y$D~_+9xI>Y5)l&vAn0b7C*s8{7Tc0u7YDlCz=a=S{DA?L6B!d_l zxrynCRhfCI+YK}sll9mj($gIy8P&J%31?i!Cc?2*q{m?L1k3lD(-?y~7A`J)R8Ru| D;|?jZ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 1c95de1a43c76977f58bf8b269dd36b4e3894229..670dfe721431b9347de980c84cc915d498130bad 100644 GIT binary patch delta 91 zcmZ3thjsoQ)(KmgPiStMxI>Y5_EQEh*r2&7YWE7;m9XyoK4rZ^^T vf1<&dtjAPbJbhyrqx$xeaK>e9BAO8w7tP&c{$lsLeXCCjEcx{K%UUAY5_EQEh*r2&7YM!4G;;D2Qyi1F yX)z}2F%=h2Ul_rtJDKkW$M$&*#5?=8$N~VU$0Vx& delta 109 zcmdnJkM-0()(KmgR~}zKafc%Bs;3NKF!T8OuvLxEwmxHI(v(Pd&M(a?QLwdDNCq)9 zaud@Nt1|Oaw|~`SOx9xsOHV%-&Zse&;|AaM{s_hyY$8|k7C0O#4zpV2YMwJ`owop^ HtmJodmV8ob5D3bwWi8aeriDUM0o uk7_a|>oFAkHZEaSFlzH;-YVx_P^eF&hf+Z#Z delta 106 zcmZqJ$J)P-b;4HWmB-gl+@Z+3>L~*l%sjq6Y*pj4t} D2R$pY diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 3a5c0124bb104b500aac211f6846ad694ad0e31f..945270ea1a54c9cd38d4dfd40b8fa37e5518920c 100644 GIT binary patch delta 95 zcmZ3rmv#1D)(KmgPiStMxI>Y5_EQEh*r2&7YM!4G;;D2Qyi1F yCulMz>oFA*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf index 8de17f0e..2bc674d4 100644 --- a/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf +++ b/Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf @@ -319,7 +319,7 @@ if (typename _this == "ARRAY") then { if (!_canBeRevived) then { _newPlyr setVariable["REVIVE", _canBeRevived] }; - [_plyrNetID, _plyrUID, [_newPlyr, _vars, _currWeap, count(magazines _newPlyr), _plyrGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken]] call EPOCH_server_pushPlayer; + [_plyrNetID, _plyrUID, [_newPlyr, _vars, _currWeap, loadAbs _newPlyr, _plyrGroup, _canBeRevived, _newPlyr call EPOCH_server_setPToken]] call EPOCH_server_pushPlayer; _newPlyr setVariable["SETUP", true, true]; }; diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index d929174b..31647855 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_magCount == count(magazines _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1342,7 +1342,7 @@ class FSM "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n - "_magCount = _array deleteAt 0;" \n + "_mass = _array deleteAt 0;" \n "Epoch_my_GroupUID = _array deleteAt 0;" \n "Epoch_canBeRevived = _array deleteAt 0;" \n "Epoch_personalToken = _array deleteAt 0;" \n From 13eedaba8777f3732f046dd9ddd34031cb1ed580 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 9 Feb 2016 11:44:24 -0600 Subject: [PATCH 2/3] 0.3.7.0106 --- .../mpmissions/epoch.Altis.pbo | Bin 89655 -> 89689 bytes .../mpmissions/epoch.Australia.pbo | Bin 89707 -> 89741 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 89819 -> 89853 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 89672 -> 89706 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 89773 -> 89807 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 89829 -> 89863 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 89787 -> 89821 bytes .../mpmissions/epoch.Esseker.pbo | Bin 89661 -> 89695 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 89976 -> 90010 bytes .../mpmissions/epoch.Porto.pbo | Bin 89779 -> 89813 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 89867 -> 89901 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 89938 -> 89972 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 89953 -> 89987 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 89961 -> 89995 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 89803 -> 89837 bytes .../mpmissions/epoch.Stratis.pbo | Bin 89695 -> 89729 bytes .../mpmissions/epoch.Takistan.pbo | Bin 89718 -> 89752 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89631 -> 89665 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 89915 -> 89949 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 89856 -> 89890 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 89755 -> 89789 bytes Server_Install_Pack/sc/battleye/scripts.txt | 2 +- Sources/epoch_code/System/player_login.fsm | 4 +- .../Configs/CfgBuildingLootPos.hpp | 882 +++++++++++++++++- .../epoch.Altis/System/player_login.fsm | 4 +- .../epoch.Australia/System/player_login.fsm | 4 +- .../System/player_login.fsm | 4 +- .../epoch.Bornholm/System/player_login.fsm | 4 +- .../epoch.Chernarus/System/player_login.fsm | 4 +- .../System/player_login.fsm | 4 +- .../epoch.Desert_E/System/player_login.fsm | 4 +- .../epoch.Esseker/System/player_login.fsm | 4 +- .../System/player_login.fsm | 4 +- .../epoch.Porto/System/player_login.fsm | 4 +- .../System/player_login.fsm | 4 +- .../epoch.Sara/System/player_login.fsm | 4 +- .../epoch.SaraLite/System/player_login.fsm | 4 +- .../epoch.Sara_dbe1/System/player_login.fsm | 4 +- .../epoch.Shapur_BAF/System/player_login.fsm | 4 +- .../epoch.Stratis/System/player_login.fsm | 4 +- .../epoch.Takistan/System/player_login.fsm | 4 +- .../epoch.VR/System/player_login.fsm | 4 +- .../System/player_login.fsm | 4 +- .../epoch.Zargabad/System/player_login.fsm | 4 +- .../epoch.utes/System/player_login.fsm | 4 +- 45 files changed, 910 insertions(+), 62 deletions(-) diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index ec50e14e50f92429cf75abcf7a62ba0d9a05fd40..58f11356d868e85f5d4706cc82e6e64a848e3f0c 100644 GIT binary patch delta 99 zcmdnKhxO(j)(KmgRaJIP+@Z+3_bCGyNT}=z+q?1EuVs7|#uhq8W;%w(h9G+Lhvgp| z7&WFp)L>L#QK+d=n64kfD8poAuuYRu*;GV%aNE_WYe>=N`aE#KY(00hM& A;Q#;t delta 106 zcmcb)hjsfN)(Kmg4{2_ixI>Y5_EQEh*r2&7Z1%=yzm^GD8k*@C8kp!98e4)Ho8K+} z*f9Np2BQLF?c~DM&C@@~GV)Jeb*p~zgF9T??X?)$Oho!h{h#c-;gYxV)5qU7)?2#R HUBj&b1eGkI diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index a2cadf53aea0a478085b93c116c9765cc730512f..e1ae794fc3b15a96d7597bbf02aec4bec5c22fdb 100644 GIT binary patch delta 113 zcmaF8hqZSv>x8Y$sw%rC?oj02`;-9;Bvf{V?cMlHZ#kcZv4xJ2nU0~cA&B0rvf^U{ zqsDYmO-2P4g_;_L$qUcOG8<^tPXB1j*gX0CKmN%NZq;vh*J2bf5pnp@G)r%<_oY)u PFUoG;vdrtm>esyh3x8Y$hcq`$+@Z)j`zZq$Y|z{kHhbeUz2yRyhGsg31|~X&#+G2lW~CJ$ z8>WkBGAc0EPG2a?IBD{|TlL#BwHO6VMD7Z+y-L@L)N9|k^OY5_EQEh*r2&7Z1%=y^Og%(8k*@C8kp!98e4)Hn}@_i{c9V+$Q4GaW-?LlC{0amB|5 zRgL)E#NuKFTU!N17g8inZ&A&fFiMh4pjH5rvn aMb-sp?(5{!au9RP^)cUFd@Z%A?f?L}yDH`Y delta 97 zcmaF0hxNoB)(Kmg4{L6kxI>Y5_EQEh*r2&7Z1%=y+{*~u!E!zeV+$Q4GaW-?LlC_=ZNM8cWN;Tn24-Zv|L{zHqUS8 Q9o0u|Q=S{9UjK0w00?m_ZU6uP delta 103 zcmX@Vmv!x4)(Kmg4{L6kxI>Y5_EQEh*r2&7Z1%=y1|Roo;Bv*gXA$7o*r@_1hKOS8Fi}n22yqJMgNThjFU=*0pp0Rx@7TvgJ`M E0L(`y3IG5A diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index a28fd9d8bb48c0b831656de4c367feee154f5ecc..dea4716ee359a1c01288cf93cbe23050c13a7dde 100644 GIT binary patch delta 120 zcmaF5m$iK#>x8Y$YAU-X?oj02`;-9;Bvf{V?cMln#d1CiV+$Q4GaW-?LlC`r-inV6 zj2hGXH5nC{6>4fGH(ZipSFlqsGSIA@thlCm`T{vd{>f3d>nBgR%eDQq79*R9$mWpm W^WuIu9yY3Mmh#9x=Fw8R`UU_*SuN23 delta 87 zcmZqQ$NF?H>x8Y$M>IE0+@Z)j`zZq$Y|z{kHhbf<70U%I4b5~64NP~u-Euw)V+$Q4GaW-?LlC{WWW~n@ zMvdvInv4o83NY5_EQEh*r2&7Z1%=yb;|`T4b5~64NP|Ro&HglanfYH+x6RbYB36!h`8)7)%y5g+JtY}B@vC6+4ogW;yn!jQ}Day|=V3mqdf9YbS75WV@^@{bLS z8q=R^Fe!(wEhSvxuKYxCpY5_EQEh*r2&7Z1%!u%LObA&2$V6Omqy5Ey0YTSdt;Hx{B4V0zdBJ7r-$`<^!Tfx)uWH17g8inZvp^P$2Mh4p*wHTF6 bMdluqvR%LHZ^$m?2G4tLelr%`bmIX4^Pnu} delta 97 zcmbQWpY_K+)(Kmgk7{n3xI>Y5_EQEh*r2&7Z1%=y)++=o4b5~64NPre^Bs%~A diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index a9e6327b8335e1f77364e7b62a9a3ab1f5d909a4..0e4d82fd0c50fd6237e444a432304f8365bbf834 100644 GIT binary patch delta 110 zcmdnIm-Xsi)(KmgHB@#@+@Z+3_bCGyNT}=z+q>~u*>XM$V+$Q4GaW-?LlC_=XT`?` zMvdvQnv4o83NY5_EQEh*r2&7Z1%=yWy=LD4b5~64NPlx zHcXGvWK>|RojmdIq{(Wx>nF$D<=Vbmi;>MlB+290A-nxwEqRx&pB=^-bMEiq$*BO* Cizy`l diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 175e49cb894deeda410a604a8d4780cafcdb48e8..62f6e751f4734c23c09501c717552c3d35bfee89 100644 GIT binary patch delta 113 zcmeC)$GUbO>x8Y$8Y;Uc?oj02`;-9;Bvf{V?cMn7+;Tn(V+$Q4GaW-?LlC|B$cm2* zj2hFoYBDOYDAd#_Om;jg%WR-oJAI-ZWAo(v|NN61Zr5*ruEi)|BJ!6b#)ah<>mn74 OtfX`o>94G-*nI&Wo+#%4 delta 98 zcmZ3xkF|Rr>x8Y$$22!h+@Z)j`zZq$Y|z{kHhbfY5_EQEh*r2&7Z1%=yqALU}4b5~64NPx8Y$nku^{?oj02`;-9;Bvf{V?cMlHWd)ywv4xJ2nU0~cA&A~Awen*F zqsDY@Ek*?vg_;_L$@lNbuoxL=)=qXjGHH512xI+rTWv-G6A@O{WT|=6L(Ga}V&&5& LFKKQPdddI*7Q`gT delta 98 zcmZqP&-!p5>x8Y$$22!h+@Z)j`zZq$Y|z{kHhbeUl@$V(hGsg31|~X&#+G2lW{H&_ y8>VwQdMt7^$Y;=%_PnM diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index f832d703173e7d1d240074a2613b5214eb9b81bc..bee3ebd3e26b6d9f8f20ea06084c5df41c460692 100644 GIT binary patch delta 137 zcmaF4kF|S0>x8Y$nku^{?oj02`;-9;Bvf{V?cMlHX9b^yv4xJ2nU0~cA&B0rwDMzv zsz!WnVsWv8t*wGaPJUvFV^Xm~d_hiPWonUsQdVkmiKaqLjl%TAP(~RRBLmIa=?mo; mCr!S0yMDW?Hlu)vNaB{s9lf6lkIK6r=Q$j(&2q-=ojm~c5;E5S delta 124 zcmeC)&-!v7>x8Y$$2B)i+@Z)j`zZq$Y|z{kHhbeUofQI>hGsg31|~X&#+G2lW`&g> z8x-Sn6N`%#Y;6@Za`F>X9FvL_;tO&TD^rX7ld@8iOEhaIH~yV8`OfY7?djT#0wyBd YVX;4^uitAe@>)0BqF}rBC#z^P07gqMmjD0& diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index a7644b285d7e0f21dd560d81227b4917d9ade1a2..4cc16f0ca2c4b5c2e9668653389daea152e027cf 100644 GIT binary patch delta 113 zcmX@Tm-X#l)(KmgHC1*^+@Z+3_bCGyNT}=z+q>~u-*P?+V+$Q4GaW-?LlC{WWyQw^ zMvdvEnv4o83NaJDaqWQd OLPm=dkp<4Jl4=0?$S3gt delta 98 zcmaF6m-X~s)(Kmgk85t4xI>Y5_EQEh*r2&7Z1%=yeai(b4b5~64NP|Roz5u7IBBxo?fUH}wHO6VL_(hg?2g)>B(BSvpmXe6PSX^P*(U%u-X&}R diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 8676ae443d09cb02b1e597f45ae5f4d15235fc82..b3c85cd071784ad75ecd4fa4d5414cef8f3b963b 100644 GIT binary patch delta 115 zcmcb=hqZAp>x8Y$S}MCH?oj02`;-9;Bvf{V?cMlHX*r*Tv4xJ2nU0~cA&A~AvEpL` zqsDYjO-2P4g_;_L$s69wuoxL=)=m%PW^A6G;Ke95`Sz`f?bce10wy9S3WK-*a+LO- Q#Od)}Xuhu*`-D#^0NwN__y7O^ delta 102 zcmZqN%X)tg>x8Y$$2B)i+@Z)j`zZq$Y|z{kHhbeUrR4&ahGsg31|~X&#+G2lX0a6? z8>Vw;GAc0EPA>e~Jo&(3{^Y5_EQEh*r2&7Z1%=ymdgb!4b5~64NP|7X7{2(f>&PuLIumDM3~ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 670dfe721431b9347de980c84cc915d498130bad..0a6f2849417a6925923ae0f5e3273f3565a58a9b 100644 GIT binary patch delta 115 zcmbQghxOnd)(KmgwN-Xa+@Z+3_bCGyNT}=z+q?1Eqh)*+#uhq8W;%w(h9G+LjpZL3 z7&WG!)L>L#QK+d=m|XB)hQ-K0vv#^5H)Hd31usUi$+K@&Z2zsvC}1LT?SeqgvsK~u RjO^!JK9X48GuKwg3jlf)D>?uG delta 102 zcmX@OhjsoQ)(KmgPiStMxI>Y5_EQEh*r2&7Z1%=ykCq8o8k*@C8kp!98e4)Ho3AbZ z*f9Ns2BQLF?PSBR&667r^G`PjW~|>XtHmf_BBB{_anam8<}Y@?+qe3pz>-gozpOO^ E01<~P4FCWD diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index cb94e9eed3adce4658299632f0bec013384213c4..67ae91c5edc408cece41fad2402b693de6f981a2 100644 GIT binary patch delta 113 zcmdnJkM-_8)(KmgwN-Xa+@Z+3_bCGyNT}=z+q?1EzvX-u#uhq8W;%w(h9G+LmlYoy z7&WFp)nrs)QK+d=m|S>Pmf1kFcKSg(#^%ZM|MO4YaJzoHxHhAJiAcaZwuhHZ%aeO7 PAE>T~iCUT+BA)^Pjs+{R delta 98 zcmcb+k9GGx)(KmgPik(OxI>Y5_EQEh*r2&7Z1%=y|CS3_8k*@C8kp!98e4)Hn?J4i z*f9NxCZhsl?es!9#z~Xc-LBtmsm&;0BH~_9T9Z7r?9VJA-lNm3uO!~tw?!5Jg*PX) diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index c945ac02edac47b1e93c53fdd3f9e749318ecbb2..b4ce1a6c1678adfb7ea1fa043081054b49016433 100644 GIT binary patch delta 114 zcmZqJ$GT`A>x8Y$+A6yy?oj02`;-9;Bvf{V?cMn7@Nzy2V+$Q4GaW-?LlC`r=ZcRF zj2hEdX)-FXDAd#_Ob+}Y!(wEhSv&dRze&>tycyXi*W9kyen*Q@z(hpUFmPki@s$Vd QU$@*)&xl-l&*MrR08*7KJOBUy delta 93 zcmZ3qkF{YR>x8Y$Cp9-s+@Z)j`zZq$Y|z{kHhbfj^=IsSqjPp!Hs*bI__RU*uYqLV6%#(*#lh0+PPXPd-ZYEd& diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 945270ea1a54c9cd38d4dfd40b8fa37e5518920c..f88fd75dfe85fed050090f58a8a00f6be5d6a649 100644 GIT binary patch delta 113 zcmbQemv!%6)(KmgwN!RZ+@Z+3_bCGyNT}=z+q>~u+;Tn(V+$Q4GaW-?LlC_=WW~n@ zMvdvNnv4o83NY5_EQEh*r2&7Z1%=yamxiP4b5~64NP|Roqkc4anfYI+x6RLYB36!hy;JlTGOfCQ`lk@S(~zodzHX;i+2DGJS6r2 diff --git a/Server_Install_Pack/sc/battleye/scripts.txt b/Server_Install_Pack/sc/battleye/scripts.txt index 5304ef66..24baa581 100644 --- a/Server_Install_Pack/sc/battleye/scripts.txt +++ b/Server_Install_Pack/sc/battleye/scripts.txt @@ -21,7 +21,7 @@ 7 allowDamage !="_unit allowDamage false;" !="_unit allowDamage true;" !="player allowDamage true;" !="vehicle player allowDamage true;" !="player allowDamage false;" 7 addWeaponCargo !="_acceptHolder addWeaponCargo [_wWeapon, 1] ;" 7 onMapSingleClick !="onMapSingleClick '';" -7 addMagazine !"addMagazineCargo" !="player addMagazine [_item, _magazineSizeMax];" !="player addMagazine [_item, floor (_magazineSize % _magazineSizeMax)];" !="player addMagazine [(_x select 0),(_x select 1)]" !="player addMagazine \"sledge_swing\";" !="player addMagazine \"Hatchet_swing\";" !="player addMagazine \"stick_swing\";" +7 addMagazine !"addMagazineCargo" !="player addMagazine [_item, _magazineSizeMax];" !="player addMagazine [_item, floor (_magazineSize % _magazineSizeMax)];" !="player addMagazine[_x select 0, _x select 1];" !="player addMagazine \"sledge_swing\";" !="player addMagazine \"Hatchet_swing\";" !="player addMagazine \"stick_swing\";" 7 addMagazineCargo !"_dogHolder addMagazineCargo [\"RabbitCarcass_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"Pelt_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"Venom_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"SnakeCarcass_EPOCH\", 1]" !"_dogHolder addMagazineCargo [\"ChickenCarcass_EPOCH\", 1]" !="_acceptHolder addMagazineCargo [_wAmmo, 1] ;" 7 addItem !="{player addItemToVest _x} forEach _vestItems;" !="player addItem _item;" !="_plyr addItemToVest _missionItem;" !="axeVIP addItemToVest _item;" !="_plyr addItemToVest _missionItem;" !="EPOCH_fnc_addItemOverflow" 7 addBackPack diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp index 24dbaf40..5f0e905c 100644 --- a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp +++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp @@ -3499,43 +3499,60 @@ class CfgBuildingLootPos }; class Land_Panelak2 : Default { shelfPos[] = { - { { 4.20508, -4.24121, 5.41052 }, 90.3016 } + { {4.4043,-1.56323,-3.65}, 91 } }; fridgePos[] = { - { { 7.20898, 3.8916, 5.41022 }, 90.4745 } + { {1.9834,2.03857,0.499998}, 272 } + }; + bedPos[] = { + { {-4.88916,-3.16589,5.89}, 0 }, + { {5.43604,-5.94202,3.18999}, 181 }, + { {5.45801,-5.94385,8.59001}, 181 }, + { {-5.46143,-5.94287,0.489996}, 1.99997 } }; couchPos[] = { - { { -4.25195, 0.902344, 8.29941 }, 59.4268 } + { {-5.00977,-3.07544,0.480007}, 1.99997 }, + { {5.09668,-3.39209,0.479996}, 90 } }; wardrobePos[] = { - { { 5.46094, 1.24414, 5.41287 }, 357.96 } + { {4.59766,-0.0115967,0.479996}, 356 }, + { {-5.25439,0.0623779,5.89}, 0 } }; cookerPos[] = { - { { 2.14648, 4.04395, 5.40982 }, 270.01 } + { {4.62402,2.86633,0.499998}, 1.99997 }, + { {-4.70605,2.86169,8.59001}, 0.999969 } }; chairPos[] = { - { { 4.50977, -1.51123, 5.44611 }, 241.946 }, - { { -6.61035, 0.507813, 8.29944 }, 165.78 } + { {2.31104,2.58813,8.62001}, 305 }, + { {7.03857,2.58655,8.62001}, 55 }, + { {5.39697,-5.3064,0.479996}, 315 } }; filingPos[] = { - { { 2.0459, -6.52539, 5.41025 }, 206.326 } + { {-1.15771,-4.87915,-3.64}, 274 }, + { {1.87988,-5.90552,8.62001}, 272 }, + { {-7.38721,2.91736,0.499998}, 274 }, + { {7.45752,-6.97949,8.62001}, 174 } }; pelicanPos[] = { - { { -0.511719, 4.30273, 4.026 }, 343.273 } + { {-5.44238,-6.4325,8.55001}, 111 } }; tablePos[] = { - { { 7.14258, -0.713867, 5.41226 }, 89.9922 } + { {2.06348,-3.77393,-3.65}, 270 }, + { {4.57178,2.84717,8.62001}, 0 }, + { {3.30176,-7.8053,0.479996}, 181 } + }; + lockerPos[] = { + { {-1.12158,2.33093,-3.64}, 270 } }; shoeboxPos[] = { - { { -5.76758, 0.51709, 8.29941 }, 287.425 }, - { { 5.38281, -6.46777, 5.41022 }, 321.607 } - }; - palletPos[] = { - { { 0.361328, -0.00292969, -4.00781 }, 39 }, - { { 6.25586, 3.7168, 8.33218 }, 89 } + { {1.17773,-4.98572,0.479996}, 311 } }; freezerPos[] = { - { { 4.01465, -5.87646, 5.49216 }, 89 } + { {-2.15332,2.48828,8.59001}, 89 } + }; + cabinetPos[] = { + { {2.7334,3.25964,-2.25}, 89 }, + { {-7.58789,0.991089,9.79001}, 0 } }; }; class Land_Panelak : Default { @@ -6110,4 +6127,835 @@ class CfgBuildingLootPos shoeboxPos[] = { { { 0, 1, -10 }, 106.559 } }; palletPos[] = { { { 1, 0, -10 }, 322.16 } }; }; + + + // start new for 0.38 + class Land_Majak_v_celku : Default { + pelicanPos[] = { + { {0.640625,-5.32837,3.73342}, 87 } + }; + shoeboxPos[] = { + { {0.935059,-6.73767,-6.0666}, 168 } + }; + }; + class Land_Kamenolom_budova : Default { + lockerPos[] = { + { {5.28259,8.6792,-7.4996}, 270 } + }; + toolRackPos[] = { + { {4.55896,5.77637,-7.4996}, 270 } + }; + shoeboxPos[] = { + { {-5.70508,11.5742,-7.4996}, 294 } + }; + palletPos[] = { + { {-7.30725,-6.28027,-7.4996}, 294 }, + { {-0.434082,-13.2734,-7.5096}, 294 } + }; + }; + class Land_pila : Default { + palletPos[] = { + { {4.11987,-10.7354,-10}, 358 } + }; + }; + class Land_vez_ropa : Default { + shoeboxPos[] = { + { {1.22119,-3.17627,-2.08988}, 40 } + }; + }; + class Land_Telek1 : Default { + pelicanPos[] = { + { {-1.76807,0.981689,-7.46783}, 294 } + }; + }; + class Land_Hut02 : Default { + couchPos[] = { + { {-0.0549316,2.4751,-0.375967}, 269 } + }; + chairPos[] = { + { {-0.932617,-1.18945,-0.375967}, 224 } + }; + shoeboxPos[] = { + { {1.15332,0.0302734,1.73403}, 224 } + }; + }; + class Land_Hotel : Default { + shelfPos[] = { + { {1.78857,13.251,-7.75587}, 270 }, + { {1.77783,15.3574,-7.75587}, 270 }, + { {-10.7646,-15.3672,-0.742306}, 90 } + }; + fridgePos[] = { + { {5.14795,18.9282,-7.75587}, 0 } + }; + bedPos[] = { + { {2.94043,-11.6416,-4.28587}, 270 }, + { {-11.6963,-3.02222,2.7677}, 0 }, + { {12.1147,2.66748,2.7377}, 92 }, + { {-12.1445,-2.65576,-0.742306}, 273 }, + { {-17.7935,-2.72681,-4.28587}, 270 }, + { {11.6216,17.6189,-0.742306}, 183 }, + { {18.0103,-11.6978,2.7677}, 272 } + }; + couchPos[] = { + { {6.25146,12.9585,-7.75587}, 0 }, + { {-14.5313,-9.24268,2.7377}, 92 }, + { {-3.47803,17.551,-0.742306}, 303 }, + { {11.7266,-14.7947,-4.28587}, 180 }, + { {5.41016,-18.1577,2.7377}, 92 }, + { {15.5991,11.7637,2.7377}, 92 }, + { {-18.0391,17.2517,-4.28587}, 180 } + }; + wardrobePos[] = { + { {-12.8257,-10.0503,-0.742306}, 183 }, + { {-18.6489,-2.33789,2.7377}, 282 }, + { {-11.0015,16.1484,-4.28587}, 90 }, + { {11.1978,18.6038,-4.28587}, 290 } + }; + cookerPos[] = { + { {3.78174,18.8879,-7.75587}, 0 } + }; + chairPos[] = { + { {-11.2607,-14.3667,2.7677}, 73 }, + { {9.86719,-16.175,-4.28587}, 91 }, + { {11.1006,16.4072,-4.28587}, 270 }, + { {8.30811,18.6084,-7.75587}, 300 }, + { {-9.76025,18.7568,-7.75587}, 360 }, + { {-11.2051,-18.6255,2.7677}, 120 }, + { {-18.4653,18.6245,-0.742306}, 303 }, + { {18.6274,-18.6675,2.7377}, 120 }, + { {-18.6543,-18.6777,-7.75587}, 202 } + }; + filingPos[] = { + { {1.1377,0.964355,-4.26587}, 9.99995 }, + { {0.185059,7.87598,-7.75587}, 185 }, + { {1.1377,7.90283,-7.75587}, 180 }, + { {-10.9829,-10.9436,2.7677}, 87 }, + { {-11.0068,-18.8669,-0.742306}, 100 } + }; + pelicanPos[] = { + { {-20.3799,-2.55322,2.7677}, 57 } + }; + tablePos[] = { + { {-4.00488,-1.45679,-0.76231}, 90 }, + { {2.76025,-11.2229,2.7377}, 350 }, + { {14.6807,-11.0496,-4.28587}, 0.999985 }, + { {18.7944,2.63403,-0.742306}, 91 }, + { {-11.0342,-16.4497,2.7677}, 90 }, + { {-7.66748,18.8062,-7.75587}, 360 }, + { {-15.6953,-18.8101,-7.75587}, 180 }, + { {-18.2217,-18.6624,-0.742306}, 190 } + }; + lockerPos[] = { + { {1.95264,6.45093,6.23771}, 270 }, + { {7.01807,6.5083,6.23771}, 90 } + }; + toolRackPos[] = { + { {1.55713,3.32617,6.23771}, 270 } + }; + shoeboxPos[] = { + { {10.9087,-10.8728,-4.26587}, 0.999985 }, + { {-11.0386,-11.0518,-0.742306}, 100 } + }; + palletPos[] = { + { {2.59766,0.134766,-7.75587}, 180 }, + { {1.56494,8.67944,6.23771}, 268 }, + { {0.20459,-9.94043,6.23771}, 294 }, + { {-16.0659,-13.0327,6.23771}, 224 } + }; + freezerPos[] = { + { {2.11768,6.72607,-7.75587}, 270 } + }; + cabinetPos[] = { + { {7.31738,1.42627,-6.15587}, 180 }, + { {4.14453,7.32031,0.657692}, 90 } + }; + }; + class Land_Hut01 : Default { + bedPos[] = { + { {-0.136719,1.94006,-0.456257}, 184 } + }; + tablePos[] = { + { {-0.213867,-1.56018,-0.456257}, 180 } + }; + }; + class Land_Hut04 : Default { + chairPos[] = { + { {-1.01709,-1.63196,-0.44096}, 190 } + }; + toolRackPos[] = { + { {1.63916,0.498535,-1.33096}, 270 } + }; + shoeboxPos[] = { + { {1.31445,3.20374,-0.44096}, 30 } + }; + palletPos[] = { + { {-3.30371,-1.28149,-10}, 180 } + }; + freezerPos[] = { + { {-0.919922,2.90234,-0.44096}, 350 } + }; + }; + class Land_Kostel_mexico : Default { + chairPos[] = { + { {-6.86377,-7.20459,-2.7923}, 200 } + }; + pelicanPos[] = { + { {6.55908,-4.72803,-2.7923}, 9.99996 } + }; + tablePos[] = { + { {-6.50439,-4.60132,-2.7923}, 359 } + }; + shoeboxPos[] = { + { {4.07666,-7.46338,-2.7923}, 9.99996 } + }; + }; + class Land_Watertower1 : Default { + shoeboxPos[] = { + { {-7.45605,1.86682,5.2103}, 101.7 } + }; + }; + class Land_Army_hut3_long : Default { + shelfPos[] = { + { {-3.35315,-4.39209,-1.27432}, 271 } + }; + filingPos[] = { + { {1.96436,-3.27832,-1.27432}, 34 } + }; + pelicanPos[] = { + { {0.996826,4.99609,-0.914318}, 9.99997 } + }; + lockerPos[] = { + { {1.09717,-2.47021,-1.27432}, 181 } + }; + toolRackPos[] = { + { {0.157471,1.62988,-1.61432}, 4 } + }; + shoeboxPos[] = { + { {-3.00354,-1.61279,-0.0743189}, 260 } + }; + }; + class Land_Garaz_s_tankem : Default { + pelicanPos[] = { + { {3.15186,4.26843,-1.70066}, 329 } + }; + toolRackPos[] = { + { {6.14355,5.57983,-2.70066}, 359 } + }; + palletPos[] = { + { {-3.16113,4.19702,-2.50066}, 181 }, + { {5.40088,1.94946,-2.50066}, 181 }, + { {-6.79199,3.48682,-2.50066}, 181 } + }; + cabinetPos[] = { + { {2.14697,2.5321,-1.47066}, 360 } + }; + }; + class Land_Ammostore2 : Default { + shelfPos[] = { + { {2.84912,1.64783,-2.42861}, 90 } + }; + palletPos[] = { + { {-1.95752,1.25012,-2.42861}, 359 } + }; + }; + class Land_Vysilac_budova : Default { + shelfPos[] = { + { {-2.104,-4.41748,-6.5729}, 270 }, + { {5.21436,-5.04321,0.417093}, 182 }, + { {-8.69434,8.19604,-6.5929}, 359 }, + { {-1.92578,15.3926,-6.58291}, 0 }, + { {9.07471,-13.5862,-3.0929}, 180 } + }; + fridgePos[] = { + { {-11.7583,-8.78931,-3.09291}, 268 } + }; + bedPos[] = { + { {-0.967285,-6.52271,0.427094}, 272 }, + { {-7.28223,-12.6365,-3.0929}, 100 } + }; + couchPos[] = { + { {-0.827637,-3.43579,-3.09291}, 169 }, + { {-1.39453,-6.76685,-3.09291}, 280 }, + { {-8.00391,-11.429,0.427094}, 182 } + }; + wardrobePos[] = { + { {0.20459,-12.4326,-3.09291}, 89 } + }; + cookerPos[] = { + { {-11.6777,-6.63428,-3.09292}, 272 } + }; + chairPos[] = { + { {-1.50977,0.173096,0.417093}, 302 }, + { {-1.59326,-4.58447,0.427094}, 232 }, + { {-5.96924,-8.75244,-6.5729}, 170 }, + { {-9.95166,-8.39478,-6.5729}, 220 }, + { {13.5186,-13.0178,-3.09292}, 120 }, + { {15.2505,-13.1157,-6.58291}, 240 } + }; + filingPos[] = { + { {-0.894043,0.622803,-6.5729}, 0 }, + { {1.16455,-11.3594,0.417093}, 282 }, + { {1.06055,-13.498,0.417093}, 262 } + }; + pelicanPos[] = { + { {13.4917,14.0208,3.93709}, 100 } + }; + tablePos[] = { + { {-1.76367,-2.21191,0.417093}, 272 }, + { {6.23633,3.8894,-6.5729}, 90 }, + { {6.21191,6.96362,-3.09291}, 90 }, + { {-10.2241,-5.08301,-6.5729}, 270 }, + { {-5.21729,-13.3079,0.427094}, 182 } + }; + lockerPos[] = { + { {7.87207,15.2065,-6.58291}, 0 } + }; + toolRackPos[] = { + { {1.13232,11.9448,-6.5929}, 270 } + }; + shoeboxPos[] = { + { {-1.19873,1.65063,-3.45291}, 150 }, + { {-0.467773,-2.51709,-5.9529}, 107 }, + { {-7.01758,-5.84106,-2.4929}, 340 } + }; + palletPos[] = { + { {8.2959,-3.53076,-6.58291}, 350 }, + { {-7.6123,-12.1265,3.93709}, 70 }, + { {-7.8208,14.1892,3.93709}, 70 } + }; + freezerPos[] = { + { {5.76318,10.9131,-6.58291}, 170 } + }; + cabinetPos[] = { + { {-4.88965,9.68774,-4.9529}, 0 }, + { {12.0303,13.3145,-1.58291}, 270 } + }; + }; + class Land_Army_hut_int : Default { + filingPos[] = { + { {-2.10864,-4.15771,-1.32744}, 0 } + }; + pelicanPos[] = { + { {2.05151,-1.40674,-0.157444}, 14.2 } + }; + lockerPos[] = { + { {3.01929,-5.78467,-1.32744}, 90 } + }; + shoeboxPos[] = { + { {-1.70337,0.552734,-1.32744}, 320 } + }; + cabinetPos[] = { + { {3.38306,-2.79785,0.0725565}, 180 } + }; + }; + class Land_Ss_hangard : Default { + shelfPos[] = { + { {7.96484,23.6194,-5.85834}, 360 }, + { {13.9126,-21.1853,-5.86834}, 180 } + }; + lockerPos[] = { + { {-9.27832,23.4492,-5.85834}, 360 } + }; + palletPos[] = { + { {12.5146,-0.696777,-5.85834}, 270 }, + { {-13.4209,10.2603,-5.85834}, 90 } + }; + cabinetPos[] = { + { {-13.562,-21.281,-4.40834}, 270 } + }; + }; + class Land_Army_hut2 : Default { + couchPos[] = { + { {-0.26416,-4.94482,-1.32744}, 270 } + }; + filingPos[] = { + { {3.11523,-6.30835,-1.32744}, 180 } + }; + pelicanPos[] = { + { {-1.24707,0.845947,-0.147443}, 340 } + }; + toolRackPos[] = { + { {3.4707,-2.63574,-1.32744}, 90 } + }; + }; + class Land_Letistni_hala : Default { + pelicanPos[] = { + { {-0.218994,-0.153809,-1.67213}, 130 } + }; + shoeboxPos[] = { + { {1.33838,-4.40283,-8.27213}, 290 } + }; + palletPos[] = { + { {4.95361,6.68408,-8.27213}, 270 } + }; + }; + class Land_Army_hut3_long_int : Default { + shelfPos[] = { + { {-0.243164,-2.62061,-1.23305}, 180 }, + { {-3.44531,-4.89258,-1.23305}, 270 } + }; + filingPos[] = { + { {0.609375,-3.22754,-1.23305}, 0.0999832 }, + { {1.30493,-3.27246,-1.23305}, 20.1 } + }; + pelicanPos[] = { + { {-0.883057,0.716797,-0.303053}, 356 } + }; + shoeboxPos[] = { + { {1.74292,5.30566,-0.823053}, 20 } + }; + cabinetPos[] = { + { {-3.54565,3.79199,0.066947}, 0 } + }; + }; + class Land_Vysilac_FM : Default { + pelicanPos[] = { + { {0.807861,-0.467285,8.35913}, 290 } + }; + }; + class Land_Dum_mesto_in : Default { + shelfPos[] = { + { {-3.18652,2.92676,-4.26343}, 180 } + }; + bedPos[] = { + { {5.36743,-1.99609,-4.27343}, 6.00002 }, + { {4.38062,4.47559,-4.27343}, 182 } + }; + couchPos[] = { + { {1.6665,-2.45313,-1.27343}, 90 }, + { {-4.39233,4.57129,-1.27343}, 270 } + };. + wardrobePos[] = { + { {6.20532,1.30859,-4.27343}, 90 } + }; + chairPos[] = { + { {-3.18335,-1.9375,-1.27343}, 160 } + }; + filingPos[] = { + { {-1.00171,1.78223,-1.27343}, 90 }, + { {-6.19067,0.304688,-4.27343}, 270 } + }; + tablePos[] = { + { {6.05176,1.23438,-1.27343}, 90 } + }; + shoeboxPos[] = { + { {-5.2439,5.36328,-4.13343}, 340 } + }; + }; + class Land_Hospital : Default { + palletPos[] = { + { {-2.96191,5.99878,-10}, 180 } + }; + cabinetPos[] = { + { {-6.74365,5.39355,-0.194811}, 90 } + }; + }; + class Land_Army_hut2_int : Default { + shelfPos[] = { + { {3.22949,0.0185547,-0.945215}, 90 } + }; + filingPos[] = { + { {3.07861,-1.13037,-0.945215}, 79 }, + { {3.13208,-1.79688,-0.945215}, 89 } + }; + pelicanPos[] = { + { {-1.51001,0.575684,-0.00521517}, 270 } + }; + cabinetPos[] = { + { {-0.0717773,-0.947266,0.064785}, 90 } + }; + }; + class Land_Army_hut_storrage : Default { + palletPos[] = { + { {0.295654,-4.19238,-10}, 119 } + }; + }; + class Land_House_y : Default { + bedPos[] = { + { {-1.7063,-2.56055,-1.40579}, 273 } + }; + couchPos[] = { + { {2.24292,3.52246,-1.40579}, 273 } + }; + wardrobePos[] = { + { {-4.69897,-3.54785,-1.40579}, 210 } + }; + chairPos[] = { + { {-4.76099,-4.80371,-1.40579}, 354 } + }; + shoeboxPos[] = { + { {-2.03223,4.33154,0.00421143}, 50 } + }; + freezerPos[] = { + { {-2.14355,2.76807,-1.40579}, 89 } + }; + }; + class Land_Dum_istan4_big : Default { + chairPos[] = { + { {6.23877,4.94141,-10.3016}, 180 } + }; + shoeboxPos[] = { + { {2.96289,-2.02026,-7.35158}, 40 } + }; + }; + class Land_Afbarabizna : Default { + bedPos[] = { + { {5.90576,1.92358,-4.24116}, 280 } + }; + couchPos[] = { + { {-2.80127,-3.64136,-4.24116}, 90 } + }; + wardrobePos[] = { + { {-2.44092,2.52905,-4.24116}, 90 } + }; + filingPos[] = { + { {7.34521,6.50342,-4.24116}, 80 } + }; + shoeboxPos[] = { + { {5.61133,-4.43726,-0.171157}, 160 } + }; + palletPos[] = { + { {-2.4292,-1.48706,-0.171157}, 160 } + }; + }; + class Land_Dum_istan2b : Default { + shelfPos[] = { + { {-4.30664,2.29395,-2.33272}, 270 } + }; + toolRackPos[] = { + { {-0.512695,-1.37354,0.50728}, 0 } + }; + palletPos[] = { + { {-2.64063,-4.08057,3.80728}, 210 }, + { {-5.76074,2.11768,3.80728}, 175 } + }; + }; + class Land_Garaz_bez_tanku : Default { + palletPos[] = { + { {0.391602,1.3457,3.43286}, 319 } + }; + }; + class Land_Dum_istan4_detaily1 : Default { + chairPos[] = { + { {6.41577,4.99414,-7.29889}, 190 } + }; + }; + class Land_Dum_istan3 : Default { + chairPos[] = { + { {3.82861,-0.674072,0.592234}, 360 } + }; + tablePos[] = { + { {-2.27588,-0.626587,0.592234}, 360 } + }; + palletPos[] = { + { {9.90527,0.953369,0.592234}, 190 } + }; + }; + class Land_ZalChata : Default { + couchPos[] = { + { {-1.87109,-2.04102,-0.545453}, 270 } + }; + tablePos[] = { + { {2.46045,-1.78198,-0.545453}, 90 } + }; + }; + class Land_Hlaska : Default { + pelicanPos[] = { + { {-0.694336,0.777344,3.79217}, 310 } + }; + }; + class Land_Budova4 : Default { + shelfPos[] = { + { {-7.06836,0.593262,-1.89329}, 360 } + }; + cookerPos[] = { + { {-2.40625,-1.25439,-1.89329}, 271 } + }; + chairPos[] = { + { {4.11328,0.133789,-1.89329}, 30 }, + { {-7.25757,1.59717,-1.89329}, 248 } + }; + filingPos[] = { + { {-6.28442,0.480469,-1.89329}, 360 } + }; + tablePos[] = { + { {6.11206,-2.82471,-1.89329}, 180 } + }; + }; + class Land_Sara_domek_hospoda : Default { + lockerPos[] = { + { {-3.9082,-2.99487,-2.75601}, 360 } + }; + palletPos[] = { + { {5.21143,-4.41309,-2.75601}, 360 } + }; + }; + class Land_Dum_istan3_hromada : Default { + shelfPos[] = { + { {0.774414,-1.74438,-3.2448}, 90 } + }; + toolRackPos[] = { + { {-0.35791,-4.48926,-3.44481}, 180 } + }; + }; + class Land_Vysilac_FM2 : Default { + pelicanPos[] = { + { {-0.713379,2.47485,8.35913}, 280 } + }; + }; + class Land_Dum_istan3_pumpa : Default { + chairPos[] = { + { {3.86157,-0.495605,1.48562}, 130 } + }; + shoeboxPos[] = { + { {-2.74524,3.34277,-1.86439}, 280 } + }; + palletPos[] = { + { {-1.52124,2.41992,1.48562}, 170 } + }; + freezerPos[] = { + { {0.296875,1.25,1.48562}, 270 } + }; + cabinetPos[] = { + { {2.3623,-1.12598,2.68562}, 270 } + }; + }; + class Land_Dum_istan2 : Default { + lockerPos[] = { + { {-0.614258,-1.77734,0.807278}, 0 } + }; + palletPos[] = { + { {6.19629,-1.01221,0.807278}, 280 }, + { {-6.34631,2.2417,3.80728}, 280 } + }; + }; + class Land_Budova5 : Default { + shelfPos[] = { + { {-1.78809,0.231201,-1.98003}, 90 } + }; + shoeboxPos[] = { + { {-1.9873,4.33667,-1.70003}, 40 } + }; + }; + class Land_Strazni_vez : Default { + filingPos[] = { + { {0.351074,0.225098,1.41236}, 90 } + }; + pelicanPos[] = { + { {1.96533,0.918213,-0.617641}, 90 } + }; + shoeboxPos[] = { + { {-1.87012,-1.2937,2.00236}, 240 } + }; + }; + class Land_Hut_old02 : Default { + toolRackPos[] = { + { {-4.69629,-3.26221,-3.04598}, 270 } + }; + shoeboxPos[] = { + { {-3.69946,1.27148,-2.07598}, 200 } + }; + palletPos[] = { + { {5.62891,-1.17334,-10}, 70 }, + { {4.64526,-7.61523,-10}, 70 }, + { {-7.48999,8.30762,-10}, 70 } + }; + }; + class Land_Cihlovej_Dum_mini : Default { + chairPos[] = { + { {-1.37402,2.89819,-2.87115}, 60 } + }; + filingPos[] = { + { {3.11719,0.488281,-2.87115}, 90 } + }; + shoeboxPos[] = { + { {2.89404,-1.75195,-1.92115}, 110 } + }; + freezerPos[] = { + { {0.0629883,1.17529,-2.87115}, 360 } + }; + }; + class Land_Panelak3 : Default { + shelfPos[] = { + { {-3.97217,-0.323242,1.84827}, 90 }, + { {4.33447,-2.9873,12.6483}, 92.1 }, + { {4.81592,3.16943,7.24828}, 180 }, + { {-4.30518,-3.88232,-6.24173}, 269 }, + { {4.30908,-4.78418,4.54827}, 90 } + }; + fridgePos[] = { + { {1.94727,4.65381,-6.24173}, 269 }, + { {-4.23584,3.40967,-3.55173}, 189 }, + { {4.93555,3.34619,4.54827}, 180 }, + { {-7.32764,4.82227,1.84827}, 270 } + }; + bedPos[] = { + { {4.81494,-0.334473,1.84827}, 180 }, + { {-4.84375,-0.621094,-6.24173}, 4 }, + { {-4.87549,-0.545898,9.94828}, 3 } + }; + couchPos[] = { + { {4.92432,-0.48584,4.54827}, 181 }, + { {4.97803,-0.483398,-6.24173}, 179 }, + { {-5.09277,-0.104492,-0.851727}, 9.99994 }, + { {-5.12061,-0.157715,-3.55173}, 9.99994 }, + { {5.17725,-0.495117,12.6483}, 172.1 } + }; + wardrobePos[] = { + { {-2.27539,-3.82617,-3.55173}, 140 } + }; + cookerPos[] = { + { {2.06689,5.27588,-3.55173}, 280 }, + { {4.73193,3.36768,12.6483}, 182.1 }, + { {-4.80322,5.31201,-0.851727}, 0 }, + { {-7.2251,5.09326,9.94828}, 280 }, + { {7.25342,5.28369,-6.24173}, 90 } + }; + chairPos[] = { + { {4.30273,0.440918,7.24828}, 271 }, + { {4.49268,-1.24609,-0.851727}, 250 }, + { {-4.40381,2.28662,12.6483}, 72.1 }, + { {5.6582,-1.521,7.24828}, 181 }, + { {5.49365,-2.74902,-3.55173}, 320 }, + { {5.65137,-2.60791,1.84827}, 0 }, + { {3.94434,5.19043,-10.4017}, 49 } + }; + filingPos[] = { + { {1.38623,-3.95361,1.84827}, 251 }, + { {-1.54346,-3.9082,12.6483}, 113.1 }, + { {-1.28711,-4.09277,-0.851727}, 100 } + }; + tablePos[] = { + { {-4.31836,-0.929688,12.6483}, 92.1 }, + { {4.16553,3.33887,-10.4017}, 89 }, + { {-5.17139,-3.00879,1.84827}, 90 }, + { {7.25635,0.77832,-0.851727}, 90 }, + { {7.2876,0.630859,7.24828}, 90 } + }; + shoeboxPos[] = { + { {1.24561,-2.60889,-6.24173}, 290 }, + { {0.272949,-4.82959,-10.3117}, 159 }, + { {5.2124,-5.4165,-0.851727}, 290 }, + { {-5.24365,-5.56543,7.24828}, 100 } + }; + freezerPos[] = { + { {-2.20654,5.12402,12.6483}, 82.1 }, + { {4.68408,3.4917,9.94828}, 180 }, + { {4.78662,3.48291,-6.24173}, 180 }, + { {-5.64893,3.48193,4.54827}, 180 }, + { {4.78369,5.229,-0.851727}, 4 } + }; + cabinetPos[] = { + { {0.809082,-3.06104,13.8483}, 182.1 } + }; + }; + class Land_Hruzdum : Default { + shelfPos[] = { + { {3.03223,1.95996,1.60511}, 90 } + }; + fridgePos[] = { + { {-2.85986,2.07886,-4.7049}, 270 } + }; + bedPos[] = { + { {2.19727,3.07666,-1.1649}, 0 } + }; + couchPos[] = { + { {1.74805,2.823,-4.7049}, 350 } + }; + tablePos[] = { + { {-0.489746,-1.57056,-1.1649}, 180 } + }; + shoeboxPos[] = { + { {-2.89551,0.536621,2.35511}, 250 } + }; + palletPos[] = { + { {-2.15186,3.05298,1.60511}, 321.1 } + }; + }; + class Land_Dum_istan3_hromada2 : Default { + shelfPos[] = { + { {1.12891,-2.01318,-1.28126}, 91 } + }; + filingPos[] = { + { {-0.769043,5.94043,-1.28126}, 0.999985 } + }; + toolRackPos[] = { + { {6.09668,0.60791,1.98874}, 180 } + }; + shoeboxPos[] = { + { {0.32666,2.89502,-4.63126}, 280 } + }; + palletPos[] = { + { {-1.53711,4.94043,2.08874}, 158 } + }; + cabinetPos[] = { + { {7.51807,3.43701,3.40874}, 178 } + }; + }; + class Land_Sara_Domek_sedy : Default { + couchPos[] = { + { {1.28503,1.28613,-2.13815}, 180 } + }; + tablePos[] = { + { {-3.38293,1.57959,-2.13815}, 180 } + }; + shoeboxPos[] = { + { {-4.06616,0.482422,-1.61815}, 80 } + }; + freezerPos[] = { + { {4.05981,4.21094,-2.13815}, 360 } + }; + }; + class Land_Sara_domek_podhradi_1 : Default { + palletPos[] = { + { {6,-3.56006,-2.76341}, 180 } + }; + }; + class Land_Posed : Default { + shoeboxPos[] = { + { {0.740234,-0.162109,0.828706}, 90 } + }; + }; + class Land_Sara_stodola : Default { + chairPos[] = { + { {-5.00146,4.23291,-2.23894}, 300 } + }; + toolRackPos[] = { + { {-2.65381,-2.55664,-2.63894}, 180 } + }; + palletPos[] = { + { {4.77759,3.48389,-2.23894}, 275 } + }; + }; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + }; diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index 31647855..88909760 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -191,7 +191,7 @@ link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,916,104,1396,104,3,603}; +window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; *//*%FSM*/ class FSM { @@ -1039,7 +1039,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_mass == (loadAbs _playerObject)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ From c1826a168f5cc3445c67e1b0f8d13732642520c1 Mon Sep 17 00:00:00 2001 From: vbawol Date: Tue, 9 Feb 2016 14:47:23 -0600 Subject: [PATCH 3/3] 0.3.7.0107 comment out enableSimulation and attempt to make use of nearObjectsReady. Revel player object earlier Change getposATL to getpos as preloadCamera uses AGL --- .../mpmissions/epoch.Altis.pbo | Bin 89689 -> 89625 bytes .../mpmissions/epoch.Australia.pbo | Bin 89741 -> 89677 bytes .../mpmissions/epoch.Bootcamp_ACR.pbo | Bin 89853 -> 89789 bytes .../mpmissions/epoch.Bornholm.pbo | Bin 89706 -> 89642 bytes .../mpmissions/epoch.Chernarus.pbo | Bin 89807 -> 89743 bytes .../mpmissions/epoch.Chernarus_Summer.pbo | Bin 89863 -> 89799 bytes .../mpmissions/epoch.Desert_E.pbo | Bin 89821 -> 89757 bytes .../mpmissions/epoch.Esseker.pbo | Bin 89695 -> 89631 bytes .../mpmissions/epoch.Mountains_ACR.pbo | Bin 90010 -> 89946 bytes .../mpmissions/epoch.Porto.pbo | Bin 89813 -> 89749 bytes .../mpmissions/epoch.ProvingGrounds_PMC.pbo | Bin 89901 -> 89837 bytes Server_Install_Pack/mpmissions/epoch.Sara.pbo | Bin 89972 -> 89908 bytes .../mpmissions/epoch.SaraLite.pbo | Bin 89987 -> 89923 bytes .../mpmissions/epoch.Sara_dbe1.pbo | Bin 89995 -> 89931 bytes .../mpmissions/epoch.Shapur_BAF.pbo | Bin 89837 -> 89773 bytes .../mpmissions/epoch.Stratis.pbo | Bin 89729 -> 89665 bytes .../mpmissions/epoch.Takistan.pbo | Bin 89752 -> 89688 bytes Server_Install_Pack/mpmissions/epoch.VR.pbo | Bin 89665 -> 89601 bytes .../mpmissions/epoch.Woodland_ACR.pbo | Bin 89949 -> 89885 bytes .../mpmissions/epoch.Zargabad.pbo | Bin 89890 -> 89826 bytes Server_Install_Pack/mpmissions/epoch.utes.pbo | Bin 89789 -> 89725 bytes Sources/epoch_code/System/player_login.fsm | 23 +++++++++--------- .../epoch.Altis/System/player_login.fsm | 23 +++++++++--------- .../epoch.Australia/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Bornholm/System/player_login.fsm | 23 +++++++++--------- .../epoch.Chernarus/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Desert_E/System/player_login.fsm | 23 +++++++++--------- .../epoch.Esseker/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Porto/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Sara/System/player_login.fsm | 23 +++++++++--------- .../epoch.SaraLite/System/player_login.fsm | 23 +++++++++--------- .../epoch.Sara_dbe1/System/player_login.fsm | 23 +++++++++--------- .../epoch.Shapur_BAF/System/player_login.fsm | 23 +++++++++--------- .../epoch.Stratis/System/player_login.fsm | 23 +++++++++--------- .../epoch.Takistan/System/player_login.fsm | 23 +++++++++--------- .../epoch.VR/System/player_login.fsm | 23 +++++++++--------- .../System/player_login.fsm | 23 +++++++++--------- .../epoch.Zargabad/System/player_login.fsm | 23 +++++++++--------- .../epoch.utes/System/player_login.fsm | 23 +++++++++--------- 43 files changed, 264 insertions(+), 242 deletions(-) diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index 58f11356d868e85f5d4706cc82e6e64a848e3f0c..5237e29d9c99af69fca737eef89012a88297452f 100644 GIT binary patch delta 267 zcmcb)hjr#2)(KmgG<_y+SK_UG$^Zrzy?2GxZhYoZ!D3=;Vz$|^(okyhlU{+%#gnB( zvlN(D9$t+9Tc*=EOQ$_|sSJ=L0g;5olgK~7?2YEeLb zv4X8adTL2Qe(_}AXWEnd*YQp6zb?4FRE;rnB=II|~8Tlu#x>Y~RYF&43lERIx6^o`F*XNbRgKu6ceRL=kmbaW>N_KR)~ zspOYpF)=nY*_<|6T|~>wT+h_P$js1C$IQY)&(Ofg$k;^3$iUo0&%)Tq)W|@`%-B-T z%-qD(VDk3mn!Faq7CJ^|I)=uEKzj50<wGKGZ0H_ zy15#oFtcNb&vYI&M(xdao+>*`|0Bf6IeFf7j_p&_7_*pEHR5vvG!<%U6ebs*k!3c}tew2^@1)5aZq;ws(_&23QA^28OpnjW zPgh9GFUn0UiB?i_adirHw^C3wR8UgViBBvlO00~Xyz#&A_Q_$4MeHKV8*c=OW<7KJ Qak={#W0#x8XLnm!Y^EAiGoWdMVV-n+tTH$JPWU@<; rzIUsBd!`m+s?K)yaK<8bkqPftoNRlRylAD<^$TnahDK9Qb~*q6efL&5 delta 274 zcmV+t0qy?HyakQD1(3A@B_xrzA`QLe00000000;yx>mih=6rYqGBq%>W_d9h1T-@- zG_#tMClo3+H!d|eGBzmNt`Y*9n(ACIKOrYbF5`13^?w zmp~=~E3**hBS4oh69Eagz$O850wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62QRy55GB7E(P$>a-EtBBU7Y{lhB{3i(A}n8Fa&lpLU6=7!0TZ{!RsnJc Y6hQcbnl8Od(#plr9k;ZmO3170je0s+$p8QV diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index d5ef92c169b02186f1af5bfdb741225e58ec1c9f..c1fca264e8e5c864d1e8ac9b1532b1e19c2d0a75 100644 GIT binary patch delta 244 zcmeynmv!%6)(Kmgw0tIRSK_UG$^Zrzy?2GxZhZEpg2lwx#BB4`N<*p1E>i_Ii%*df z(K0mFvoJ9+HZ#yMF*4ONvoy6dHP$gPx74#VvM@EW(9t!qFw!$LG_kat9KAx5-_p!N z$I#SF$I!$C#MnG>g)}3RzW(MlD;3y4^qKYR%r-xLrtC1e>Y3K$1-tkrFL@?B`QtO~ z$s5-5PtJWVuw7D}F^fq)z91*DGPNimzgQtJHL=J)DJwO(q&O%wF{M($(4cm@pd90* r$$q!%x8KxaOx4+59?n?AE~4D^a`Tb<4G!`?|K1fQw6saC^mYLNiTGF! delta 274 zcmV+t0qy?1y#@Wf1(3A@CM1!!A`QLe00000000;yx>mih=InR_GBq%>)_E}+1T-@- zG_wknClo3+H!d|eGBz`M13^?w zm#`)QE3<&+BS4p+69EagFed?W0wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62!RZ_WGB7E(z$pQDEt62v7Y{lhB{3i(A}n8Fa&lpLU6)~40TZ`3R{?Sd Y6in~MZMts}r*89@t2owiEbY&(H|Q)}5C8xG diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index 02527f003b81dbdb2270528cbcbdecf2d0fd3781..f05d8d4aea0e3d02594bdefb4f1fce0a1655a417 100644 GIT binary patch delta 264 zcmaF0hjrB+)(Kmgw0tIRSK_UG$^Zrzy?2GxZhRJ5A!uT3Vy2^OWU6NX20FTv6Z=Ic z|Cr3PxuB9+YVy}!fz2(Gr9`w0jrA-{OpMJ8bWDJX%`8nVO^tO-%q{gSjVw%!EOc~D zER6IF4NWX9C!biZ$!}?9p<`%jrekPg0%C0bw_KW$Nnd}n delta 308 zcmZ3rhxOGS)(Kmg)Kn&JSK{6KlmQGRRCa~!-S{lBLcqw>Ku6ceRL=kmbaW>>_KHsa zF_~xb=}NB6)s;UbSxk%#O*WTLRu|DSGuJb=&YXPfSH*UFEyh%x z$$Kw~^IIvX8Y(C$>BJ`%6(v^2Zl4&&*vc-lE;w^vC!dysm}{<&`R?Ltsa16c08C|K A`2YX_ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 00c06a44ee8607580a50bf6ed62c29fbe3cf3f63..a5f9518b2281d40a6b0641509c607a76c4b193e5 100644 GIT binary patch delta 258 zcmX@Vm$iQ{>x8XLT0RrEEAiGoWdMVV-n+tTH$K}}!D3=;VzzmCrJ>Yh)oOvwFDFZh zXc-#oS(um@n;Gbs7@6vsS(;j!8ta&tTk2UFS(qAG=;)eQ80i@rnpj#+)?J~=Z)s+s zV`yroV`yRmVr))cAp0|FT+2-xflpQA5tz@4Z{7iZBfph$m%by8N z?s=v?dBS?W$#%~Lx4%|n%wm#{FUU!(Of3q?FILD)O)Tx8XLYAO@AEAj4q$^ZruD!an=ZhW?{g4xK_VDpMfLn#&$V?&e8cP6Wg zXqlPonOYc`85-)CSy<>98Wa+UW}Lk4I{W6%m6B{=#_ILU&43Kf>2+$1ij(sWvhxSz7c1B*q^Fh? znF$D<=VbZi!oYfveG4Sek%o4Lj@%z zo%qC}qQuJB>51WtBGc`{8QHcAgfnKdi>y_&TwfwK&u`}))kkepo*SlK|8W%ndaP)( diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index dea4716ee359a1c01288cf93cbe23050c13a7dde..62fb533bf354508e7e2f532b66750990dfdebae9 100644 GIT binary patch delta 245 zcmZqQ$9jA(>x8XL+CCGvEAiGoWdMVV-n+tTH$MAT!D3=;Vz&8yrJ)qFk)g$AktymT zT874Y7A7XfW(GPYMy7gZmZp}b#yTeEmU@;(7N$lPI=UtnMtX*ZCYF|yQ&(v6Tbfzu z7@C^t7@C-X7@KFWkY;4k*WbKtr2-p>zP5gy+2;4plpQ8NxXwAb_nG4K3FeIalh;2J znmqBDEQrH5S^tLoc4c+OEGD`5f}F(4)S`g=Vuifa#3KKstkmR^;-J*Tlu89dgY6eJ p8OwF2ABbdR-`)|d002fFR3-ob delta 307 zcmX@Um$iK#>x8XLYAO@AEAj4q$^ZruD!an=ZhZEwg4xK_VDp1YLn#&$V?&e8B2&~w zw9L%)Of8Je3=MV6EG+a44UCM8O>~S5%uVzxjEzi<40OzlE%nUIO-v0Yr>@ZCwJ^5O zF*4IJG&Tg%o9C{OW}LoOjgfuw3h{;VvsfoARWgO-fVll^b^ZNH<%n5v_ml9`wupOc@ikd|MRn^+R9q~zl26zXoJ zplYa~q@)v{SX7i)8EZXx;~wGdPT`D&>>`^(zR!#M;dt1nvRTR_`d>FOH*QEW}A;bQ+Ajf^-ODW!!EwbEzg7}Uwo!L zdBS@B$-d78w*ORP%wm#{FUU!(Of3q?FILD)O)TJi rWWC$<+jnX)rs`}D4`(c57fJj2q^DSz`+aLd_Vb#bUsEsy#?L91(3A@CnS-#A`QLe00000000;yx>mih=FE5lGBq%>ws|oc1T-@- zG_&fHClo3+H!d|eGBz13^?w zmyjj_E3;tcBS4pc69Eag5GMh00wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62q3Ik0GB7E(peX@&Et4?P7Y{lhB{3i(A}n8Fa&lpLU6(;v0TZ_uR{?Sd Y6b}z$eRvRYoO7vOHT*5cHD7EV?H3?dP5=M^ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index b98ea125a88451802de24cb020f098c0abcb5866..4c1392d3fc101451364f952b8338a5246bb21796 100644 GIT binary patch delta 258 zcmcb=hjsoQ)(Kmgw0$OSSK_UG$^Zrzy?2GxZhYof!D3=;Vz$}5(okyh)+&L`m6N4J zv4rT$+(dUw<>-N(D9$t+#%i*=F}=$_|tHRvii1)UQz{h<4Qi(! zG-Pa^p5VnOHhKH4itW}~jHx=)dBYjmw?7DD%w`wSZP}LL!y)*+S-AAX>+b087qh=i F0swmGSBJ`%6(v^2PX8FjC^G$A7$e*E1!0WY>>`)iEiB8H{XE`&>f_tuMD9~Zzi>VW0P>P+ A`2YX_ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index da1027c95eb7ea032d5cfe5dd44fa8c7c6ae9463..a6212826ed6876cf407c85b70f745f7300be792e 100644 GIT binary patch delta 264 zcmbQWpY_&0)(Kmgw0$OSSK_UG$^Zrzy?2GxZhY2RDQIGBVy2^OWU6NX20FTvCr%KZ ztTB~m^MWd7smZGS0-Lu?krL4|G}f~)F)=nX&@lljHnTLfG&R;SF}KvSG_o)?ve3~r zu`tpzG&Hfaocv>jCcmYbg^r=AnU0}}35c;-Z>2ONlfM3D&s7R+AUboyId_K8l` zn94KxcNN#>)m1+wSxk%#O*Su|qAsFkX0B&yVPs}#sAFbfp=W4dWMpijV`N}%qGw@j zWNKufV`glrXJ&3h0MMa5~vD*)ZGq$pe%snV&yMEW-kX_0Rp7-4RW-Pkt#sdIK CE@cD& diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index 0e4d82fd0c50fd6237e444a432304f8365bbf834..77bbf9a5576be13644fa62082c25c6c44a1f5dc8 100644 GIT binary patch delta 269 zcmcb*mv!o1)(KmgbbKamSK_UG$^Zrzy?2GxZhUs6g2lwx#BB50N<*p1E)4>cf7Wwv z{xz9jM9a`v&%(sS*vvr3#K=_7%+l1-)L6&F+)~fd$imdfLPyuc!bs21(8SVmvhfN{ zeoHe89Ya$y9YYfn5My)Z3TZ|ref`ZXD;3y4^pf@K%r@_RrtC0z-F42%(a#hoCma;z z3CJ&2uvJJ;Eh)$^o*e&7cJhXmeACYhGm204ea^A{qZ(rtlYD$ZPGV(h5lCrXYGRRp zQdVkmNpVnWVoIfgp+W8BiH9dmR=Zt4Ip!|c_T5^H(K_4x!x@X%McljQZtO5oKfw~R ONHlxR)j4}|!ioSU*I=Ch delta 314 zcmbQbm-Xsi)(KmgG*l*TSK{6KlmQGRRCa~!-T3TC1+$T!97N^~>p6c!OJGjlyt3nMc_Lme{<3q3;vBO_xI9U}vC6Fm!KBU2*-9W!G~ zJu`C?Q-jIID>Qj6j4gDG%ybNm4T1FL>=n|Cn>$u2ux(zoex2F$YBff!>6_IUg_#{g ze5QA(F=}s)c&6;I{l6MxHIu4Fd~RZKv4X9wf<{h$Vv1u@u|j-7PGV(hk$+NFYI2FD zLQRdrckoa7=dlUA}#l7GtW8T1sYOdVEfPxd}2{iVrA@fgK$Qv?PB4K+3X^(j$GYwYr`*Q5svef|NkVF JDXB150RXhBXnOzv diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 62f6e751f4734c23c09501c717552c3d35bfee89..7d06135fa9a2b1664e37ff4b9b632d483415689f 100644 GIT binary patch delta 244 zcmZ3xkM-?d)(KmgbbKamSK_UG$^Zrzy?2GxZhR(F$zoz`Vz!yJ%1~-@$y9;O?o*^h zvX`ZD19Zj3XiZ8R~G)4mebe~nN delta 274 zcmV+t0qy?ny#=kl1(3A@C?t`$A`QLe00000000;yx>mih<{WtgGBq%>26{0X1T-@- zG_yLCClo3+H!d|eGBzAhpv*4*929w~a7_%C%mNt_N*a?^1CIKOr3nu{+13^?w zm*6G=E3>fXBS4qX69EagU?%}`0wpM4ZDDhBAU!=GC~R+GWIb8Phx6i zV{|DXe0(62@#!1`GB7E(@F@XzEt7!K7Y{lhB{3i(A}n8Fa&lpLU6+wq0TZ`pR{?Sd Y6#WQXLu*+GrN9QFoj0sA+Z^*;*mih=3{vSGBq%>O?ojJ1T-@- zG_!$}Clo3+H!d|eGBzVrpe$bSWTwe3S9g z8V4XgATls1eUp*VgOgAH50gLX2$SXecehC^0c9*EWNBe%Uux8XLx;_)PEAiGoWdMVV-n+tTH$E$>WHB)|G20wnWhljLWN5K@!W4B8 zEkk2H3lkG#GXotHBU3#yOH)fzV;vK7OFc^?3sWNt9bFR(BRxYy6HCj<4_9dNTbfzu z7@C^t7@C-X7@NgcN;5L)>u)w%rN9QFgEp))+noJe*U7oP0!Tzhi= zdcMi`FAHv;ug;joBp+XplUSKr6p&x6ke8ZRmih=5l!hGBq%>TzWAY1T-@- zG_#PDClo3+H!d|eGBzE3*dY zBS4eC*b%qBCjn{#Bq(2PVRLgJJv|^OY;R#?L1J?tUvO+;d1Z1>Vrpe$bSWTwe3H`| z2OvHmGB7E9lVS9dlTPUfll1#{lMvntlUv$;x8N%Q-76+!X<=tyY;R{EW^ZzBVRTy} zB1A<(RYy7?B{3i(A}n8Fa&lpLU6&zQ0TZ{qR{?Sd6a@ui8lIO_HgjBEA7+!JgMt#} E0Q_NNiU0rr diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index bee3ebd3e26b6d9f8f20ea06084c5df41c460692..eee24b1fa0cb43c39f6214a92cead31178a56cef 100644 GIT binary patch delta 269 zcmeC)&w6?v>x8XLx;_)PEAiGoWdMVV-n+tTH$JPX6f`k5G1JjCGSxEx10CJTiG8Az zC8zRCeqF`2d3M!L$;n4*1U4_7A|;|_Xsl;pVq$D&pko5mU}kA*X=Wo=T^6>>ZiIu5E0r|xWd8vs- z{z+M>$tA@>sfj6-3Wf%?lN>}wNtEL!kJNtXq-&3~L M8W(n+KB%!30JLXdKL7v# delta 296 zcmV+@0oVS^z6FcF1(3A@DI}4%A`QLe00000000;yx>mih=6ZPpGBq%>WO^|g2{bb? zG%PJKH87JgloPYCln)dtHa9LcI5IXdF)TJXI4&_TGBPtXEHW@RG%h$ZGBq+VEH*Pa zE;ctbH87Lus3{FNGdL_VHY_nSF*qzTvmvP)0h3^`7_(NY2nMrYu&y?jF(&~kmuV*f z69Yk1OqV_<0V}f(=OaLuE))R?lhD`*x5g&{Y62xFUu|J?b09rEASi5aVPrvKb0A-E zY+-q2a!+DvWn*+HAbflvlTYd#1TruweUowUgOkw250mu!f45*O0c9+c-qIHjIv^!6 uAR;0xUtw}`VR>Db@mT>Hx6D@oYX=lzw3CR9@^Qr4qP_{Xk+qsO+v160~ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index 4cc16f0ca2c4b5c2e9668653389daea152e027cf..b59c3ae4953bed6e815c7ffd4f19fc7d2146b048 100644 GIT binary patch delta 244 zcmaF6mv!x4)(KmgbbTgnSK_UG$^Zrzy?2GxZhUs9g2lwx#BB4?N<*p1CQ}7Avrmx{ z(K0mFvoJ9+HZ#yMF*4ONvoy6dHP$gPx74#VvM@EW(9t!qFw!$LG_kat?7c#h-_p!N z$I#SF$I!$C#Ms=pLYk3DUw`wQl?rSide8cGW}B}*Q+Ak~^-OE>gk5}-r#us${P3Cf zbC&xY)*v_fWn8hR?UyzennOYQ(U#yUqnpotYl$DxXQXG_;m{O@=Xiz(yQI2ua rWV_q-+fQmSrs`}@4`(c57dbdVa*agF^b+y#?*P1(3A@DI}4%A`QLe00000000;yx>mih=G=G#GBq%>#(6Os1T-@- zG_(4XClo3+H!d|eGBzb8Phx6i zV{|DXe0(62vFRKGGB7E(uqgp|Et5df7Y{lhB{3i(A}n8Fa&lpLU6)Z<0TZ_;R{?Sd Y6bc8Q79`Hd*1$8N0XWE6a6^R|CgXuvF8}}l diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index b3c85cd071784ad75ecd4fa4d5414cef8f3b963b..c6760a88746f51b44df7e7170b5dfbf888914869 100644 GIT binary patch delta 253 zcmZqN%X)AR>x8XLdOj1kEAiGoWdMVV-n+tTH$E$@YcCJ^N(VXUdZu9`R4sd?qy6 z?wR)F^Oxke&sAg0Vv>(9$VseBEegmlR>(_DEb>pvN=+^)4oXc-sZ=mDsGVH+wR!S^ z!~D|=f*I?#$7(UA>P*)UXJp^b6wa811(3A@DkPD&A`QLe00000000;yx>mih=5TleGBq%>T6r-V1T-@- zG_#JAClo3+H!d|eGBz zDGfL?I4m+YEHN`NI4m-=7pNNnvoxt729sdd2eVzTr#6#d*9n&}CIKOrUnT()13^?w zlMv=BvjpZNK$E@K5x2Z10crvzC|_-1b8{d)Js>D-Z((FXVsjv0aBN|DWpYnqYGq?| zDIk1&Ad}(S90W2jDSelbQ~{EcOy~%c;M#YS4&4g3U@8GyEGA@WVP{`#Z)YH8Z*py6 zbXy`KL`6bXM>-%SF(4u$EMH-Aa$$L0m)uqX8n?n$0c!^o$Z=D*`av5@k_kxn5}!>r H2axh)(4uCh diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index a72cf16f1c2ffcf70db15822fbac14316d7c84cc..38ac8d2c62ece3206e3e5abb1b356d80d21f2311 100644 GIT binary patch delta 244 zcmbQSm-WUT)(Kmg^n506SK_UG$^Zrzy?2GxZhY2W!D3=;Vz#-U(ol-o$k1Z*(#h%~ zT874Y7A7XfW(GPYMy7gZmZp}b#yTeEmU@;(7N$lPI=UtnMtX*ZCYF|yzb)6~w=}cR zF*G&PF*Gp&F*fV0kY;4k*Wc{EQh^Obr>|dUwz=V%vcqK2XIhgJ4)RU5e(9$VseBEegmlR>(_DEb>pvN=+^)4oXc-sZ=mDsGUC1hH=v5m$&LC q%irbNUZ=$vt+QPyoUw>q#MI>dwF$3v+xvF!RZs|aI53_6jt~I27F47F delta 307 zcmcbyhjqqY)(Kmgv{WW;SK{6KlmQGRRCa~!-T17%g4xK_U~^%mp%jaWv7yQ4rIXb~ zw9L%)Of8Je3=MV6EG+a44UCM8O>~S5%uVzxjEzi<40OzlE%nUIO-v0Ye_O7}Yhi4m zV`QddXlw|iH|wpCW}I%P#>hUoWWC_#`vm{c|5a}$e;6>M!4G;;D2Qyi0u72*qW5-U@S{FAa$ zlS?!eYHAcFZ#W~%Y@k^?ospZddGdo>ecN-j7*loBQZf_M<8$)U71HvHauZ9Um6Tju zokHEM6jTirl$3Ph6N`!xD`U6s4`Xa)7m2ocvHRA=7hN8AtGGIrzG5o-%I*OGSSn;B diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 0a6f2849417a6925923ae0f5e3273f3565a58a9b..4d94fa7a215cac1563b37612a48ef02759c0cbf2 100644 GIT binary patch delta 252 zcmX@OhqZAJ>x8XL`aTo4EAiGoWdMVV-n+tTH$F3{U@u>(BLV*oL3#?yfwpsI;vcqJ7_3V?6K2@Idh=20Sr$Uqe zJ=LDve@T9OtQun$lYD$ZPGV(hQ9ypNLSAZOk$+NFYH~?&P-XtHqeAGyQ!SBm4G4VT{@AA`0mih<}i2zGBq%>8hJ4q1T-@- zG_y{VClo3+H!d|eGBz^FqA0`1413^?w zlhEZWv&7{iK$Csf5x0CM0crvzC|_-1b8{d)Js>D-Z((FXVsjv0aBN|DWpYnqYGq?| zDIk1&Ad{in90W2jDSekwQ~{Ec4Cn}xpxSqn&fE&OASwY{EGA@WVP{`#Z)YH8Z*py6 zbXy`KL`6bXM>-%SF(4u$EMH-Aa$$L0mz-7s8n=R00c!^o*3b}a=BiiTGC!Qt#9?=g HojnptF|}wW diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index 67ae91c5edc408cece41fad2402b693de6f981a2..f0a02eda686850d547370a6fa332e13ac92d64ce 100644 GIT binary patch delta 243 zcmcb+k9F=o)(Kmg^nE67SK_UG$^Zrzy?2GxZhYob$zoz`Vz$||%1~~n$bmFkRHO!DysIf<32MFIK63VErCMgB=ysmUe9L8*x;l?sLiwbKjb7$;3$ qce{SOr8Z-#&i3o!j797sTAk+@gxdGcj0-yYaW~(MRh#?W_W}UQ300N= delta 273 zcmV+s0q*{tz6IUB1(3A@Dmih=1h45GBq%>HhM7{1T-@- zG_z`yClo3+H!d|eGBzmCjlXsJ0}4X13^?w zmk=ibE3@F{BS4lE0SUK|CjoK-B`9BQVRLgJJv|^OY;R#?L1J?tUvO+;d1Z1>Vrpe$ zbSWTwd?1q{>Kp?yFe$enDgk#bld#ek4>}+vF(4u$EMH-Aa$$L0m%&&86StRF0dfZv XQ0@ld(=~Tvj5**Xs9aj5Yg8X(nJ`s4 diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index b4ce1a6c1678adfb7ea1fa043081054b49016433..d5200296734278d090fb2be9687d3d8c216e75aa 100644 GIT binary patch delta 236 zcmZ3qkM+@B)(Kmg^nE67SK_UG$^Zrzy?2GxZhR(K$zoz`Vz&8LrJ)qFk)g$A{VD1q zT874Y7A7XfW(GPYMy7gZmZp}b#yTeEmU@;(7N$lPI=UtnMtX*ZCYF|y8&+uYTbfzu z7@C^t7@C-X7@N1PkY;4k*WY|`r2-p>{K;L delta 316 zcmaE~mvzxT)(Kmgv{fc~S5%uVzxjEzi<40OzlE%nUIO-v0YH>}X)wJ^5O zF*4IJG&Tg%n|G{`X54&rr2^aL@9Wo@O+TT=s3jI(kds)MS`?69tYE8b=9Q=z6t zVY;FZqsU~xvz*KZnzhp}$}&!x{PqRM_69A+J34A9nThG~Ir-@dY57IDi6zlWN-nNW zq3%`+s)hh0MMa5~vC|JmG73+h5YEWHJvp2)n_WcIFmPki@s$VdU$@*)&xl-l I&*MrR06v#%sQ>@~ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index f88fd75dfe85fed050090f58a8a00f6be5d6a649..1440849ec2db8122e85128fef41247d301354880 100644 GIT binary patch delta 244 zcmdnHm-X)+)(Kmg^n506SK_UG$^Zrzy?2GxZhW?;g2lwx#BB4_N<*p1EK>zGU!N=` zqGf2TXJKMuY-XTiVq~gkW@&0^YOG^oZmDN!WMOJ#p`&YJVWekhXkuwOS$c&gzonUl zj-jcUj-iPOh_N|vg)}3RzW(N%l?rSix@Y}5v&~DNDLYKIdZslwVHe-zlxM<|H$Kyz zT(F*hvhH(%?KjmJvzX-L3vv=GQ;P!fixu)x6N~(lvQm>vii1)UQz{h<4Qi)flx3VW rneTS}_L*9YsXE)u!x@X%MUI_Lww~v5OI1UC^ILAe^q+sC-(>>;l|EKS delta 274 zcmV+t0qy?%yam0z1(3A@DkPD&A`QLe00000000;yx>mih=B#)FGBq%>mU%H61T-@- zG_%T+Clo3+H!d|eGBzYsOvv8>(29t297_+LcmNt`|*9n(wCIKOrnb8Phx6i zV{|DXe0(62f$1CrGB7E(fGGiYEt3$^7Y{lhB{3i(A}n8Fa&lpLU6&zP0TZ|PRsnJc Y6bXjs{)K!>mavqM^O&o9+!d-jUC5kS-T(jq diff --git a/Sources/epoch_code/System/player_login.fsm b/Sources/epoch_code/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/epoch_code/System/player_login.fsm +++ b/Sources/epoch_code/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Altis/System/player_login.fsm b/Sources/mpmissions/epoch.Altis/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Altis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Altis/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Australia/System/player_login.fsm b/Sources/mpmissions/epoch.Australia/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Australia/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Australia/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bootcamp_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Bornholm/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Chernarus_Summer/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Desert_E/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Esseker/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Esseker/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Mountains_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Porto/System/player_login.fsm b/Sources/mpmissions/epoch.Porto/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Porto/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Porto/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm +++ b/Sources/mpmissions/epoch.ProvingGrounds_PMC/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara/System/player_login.fsm b/Sources/mpmissions/epoch.Sara/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Sara/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm +++ b/Sources/mpmissions/epoch.SaraLite/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Sara_dbe1/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Shapur_BAF/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Stratis/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Stratis/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Takistan/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Takistan/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.VR/System/player_login.fsm b/Sources/mpmissions/epoch.VR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.VR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.VR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Woodland_ACR/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm +++ b/Sources/mpmissions/epoch.Zargabad/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n diff --git a/Sources/mpmissions/epoch.utes/System/player_login.fsm b/Sources/mpmissions/epoch.utes/System/player_login.fsm index 88909760..6bede808 100644 --- a/Sources/mpmissions/epoch.utes/System/player_login.fsm +++ b/Sources/mpmissions/epoch.utes/System/player_login.fsm @@ -1,7 +1,7 @@ /*%FSM*/ /*%FSM*/ /* -item0[] = {"INIT",0,250,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; +item0[] = {"INIT",0,4346,-25.000000,-375.000000,75.000000,-325.000000,0.000000,"INIT"}; item1[] = {"FINISH",1,250,-25.000000,1475.000000,75.000000,1525.000000,0.000000,"FINISH"}; item2[] = {"true",8,218,-150.000000,-125.000000,-50.000000,-75.000000,0.000000,"true"}; item3[] = {"Version_Check",2,250,-25.000000,-75.000000,75.000000,-25.000000,0.000000,"Version Check"}; @@ -62,7 +62,7 @@ item57[] = {"Select_Weapon",2,250,150.000000,1300.000000,250.000000,1350.000000, item58[] = {"true",8,218,225.000000,1375.000000,325.000000,1425.000000,0.000000,"true"}; item59[] = {"Do_nothing",2,250,300.000000,1300.000000,400.000000,1350.000000,0.000000,"Do nothing"}; item60[] = {"Check_New_Player",2,250,-25.000000,875.000000,75.000000,925.000000,0.000000,"Check" \n "New Player" \n "Setup"}; -item61[] = {"check_new__player",4,4314,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; +item61[] = {"check_new__player",4,218,-150.000000,925.000000,-50.000000,975.000000,0.000000,"check new " \n "player not null"}; item62[] = {"true",8,218,-150.000000,-325.000000,-50.000000,-275.000000,0.000000,"true"}; item63[] = {"Process_1",2,250,-25.000000,-275.000000,75.000000,-225.000000,0.000000,"Process"}; item64[] = {"Wait_ArmA_Loading",4,218,-150.000000,-225.000000,-50.000000,-175.000000,0.000000,"Wait ArmA" \n "Loading Screen" \n "Done"}; @@ -190,8 +190,8 @@ link97[] = {85,79}; link98[] = {86,16}; link99[] = {86,22}; link100[] = {87,31}; -globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-267.582611,688.102234,2074.832520,639.674500,585,880,1}; -window[] = {2,-1,-1,-1,-1,838,26,1318,26,3,603}; +globals[] = {0.000000,0,0,0,0,640,480,1,244,6316128,1,-213.844360,425.695953,479.928528,-482.114990,585,880,1}; +window[] = {2,-1,-1,-1,-1,968,156,1448,156,3,603}; *//*%FSM*/ class FSM { @@ -204,7 +204,7 @@ class FSM name = "INIT"; init = /*%FSM*/"titleCut ["""", ""BLACK FADED"", 1337];" \n "0 fadeSound 0;" \n - "player enableSimulation false;" \n + "//player enableSimulation false;" \n "" \n "_debug = true;" \n "_myTime = diag_tickTime;" \n @@ -251,7 +251,7 @@ class FSM "" \n "" \n "" \n - "player enableSimulation true;" \n + "//player enableSimulation true;" \n "" \n "titleCut ["""", ""BLACK IN"", 1];" \n "1338 cutText ["""",""PLAIN"",0]; " \n @@ -591,9 +591,6 @@ class FSM init = /*%FSM*/"_ply = player;" \n "_group = group player;" \n "" \n - "player reveal _playerObject;" \n - "_playerPos = getposATL _playerObject;" \n - "" \n "selectPlayer _playerObject;" \n "" \n "deleteVehicle _ply;" \n @@ -1026,6 +1023,11 @@ class FSM { name = "Check_New_Player"; init = /*%FSM*/"_myTime = diag_tickTime;" \n + "" \n + "player reveal _playerObject;" \n + "" \n + "_playerPos = getpos _playerObject;" \n + "" \n "" \n """Loading Player Inventory... Please wait!"" call Epoch_updateLoadingScreen;" \n "progressLoadingScreen 0.6;" \n @@ -1039,7 +1041,7 @@ class FSM priority = 0.000000; to="Setup_Player_Obj"; precondition = /*%FSM*/""/*%FSM*/; - condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {(_mass == (loadAbs _playerObject) || (diag_tickTime - _myTime) > 20)}"/*%FSM*/; + condition=/*%FSM*/"!(isNull _playerObject) && {_playerObject getVariable [""SETUP"",false]} && {_playerPos nearObjectsReady 10}"/*%FSM*/; action=/*%FSM*/""/*%FSM*/; }; /*%FSM*/ @@ -1338,7 +1340,6 @@ class FSM condition=/*%FSM*/"!isNil ""EPOCH_C_SET"""/*%FSM*/; action=/*%FSM*/"_array = EPOCH_C_SET;" \n "EPOCH_C_SET = nil;" \n - "diag_log format[""DEBUG: %1 "",_array];" \n "_playerObject = _array deleteAt 0;" \n "_playerVariables = _array deleteAt 0;" \n "_currentWeapon = _array deleteAt 0;" \n