diff --git a/Server_Install_Pack/mpmissions/epoch.Altis.pbo b/Server_Install_Pack/mpmissions/epoch.Altis.pbo index ec50e14e..58f11356 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Altis.pbo and b/Server_Install_Pack/mpmissions/epoch.Altis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Australia.pbo b/Server_Install_Pack/mpmissions/epoch.Australia.pbo index a2cadf53..e1ae794f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Australia.pbo and b/Server_Install_Pack/mpmissions/epoch.Australia.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo index 7081e073..d5ef92c1 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Bootcamp_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo index c353e845..02527f00 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo and b/Server_Install_Pack/mpmissions/epoch.Bornholm.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo index 4eba012f..00c06a44 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo index a28fd9d8..dea4716e 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo and b/Server_Install_Pack/mpmissions/epoch.Chernarus_Summer.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo index a0ab759b..e45b752b 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo and b/Server_Install_Pack/mpmissions/epoch.Desert_E.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo index aadd13c1..b98ea125 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Esseker.pbo and b/Server_Install_Pack/mpmissions/epoch.Esseker.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo index be716b52..da1027c9 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Mountains_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Porto.pbo b/Server_Install_Pack/mpmissions/epoch.Porto.pbo index a9e6327b..0e4d82fd 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Porto.pbo and b/Server_Install_Pack/mpmissions/epoch.Porto.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo index 175e49cb..62f6e751 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo and b/Server_Install_Pack/mpmissions/epoch.ProvingGrounds_PMC.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara.pbo b/Server_Install_Pack/mpmissions/epoch.Sara.pbo index 04ac89f7..f7e782bf 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo index da9dfb36..dbc4377c 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo and b/Server_Install_Pack/mpmissions/epoch.SaraLite.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo index f832d703..bee3ebd3 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo and b/Server_Install_Pack/mpmissions/epoch.Sara_dbe1.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo index a7644b28..4cc16f0c 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo and b/Server_Install_Pack/mpmissions/epoch.Shapur_BAF.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo index 8676ae44..b3c85cd0 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Stratis.pbo and b/Server_Install_Pack/mpmissions/epoch.Stratis.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo index 94e761ec..a72cf16f 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Takistan.pbo and b/Server_Install_Pack/mpmissions/epoch.Takistan.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.VR.pbo b/Server_Install_Pack/mpmissions/epoch.VR.pbo index 670dfe72..0a6f2849 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.VR.pbo and b/Server_Install_Pack/mpmissions/epoch.VR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo index cb94e9ee..67ae91c5 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo and b/Server_Install_Pack/mpmissions/epoch.Woodland_ACR.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo index c945ac02..b4ce1a6c 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo and b/Server_Install_Pack/mpmissions/epoch.Zargabad.pbo differ diff --git a/Server_Install_Pack/mpmissions/epoch.utes.pbo b/Server_Install_Pack/mpmissions/epoch.utes.pbo index 945270ea..f88fd75d 100644 Binary files a/Server_Install_Pack/mpmissions/epoch.utes.pbo and b/Server_Install_Pack/mpmissions/epoch.utes.pbo differ 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*/