Merge pull request #35 from ShieldNavalny/master

Обновление и фиксы
ss220-space · Apr 30, 2022 · 64a9ec6 · 64a9ec6
2 parents 1df28ab + 7d6bb94
commit 64a9ec6
Show file tree

Hide file tree

Showing 21 changed files with 29,309 additions and 16,413 deletions.
diff --git a/missions/WarlordSS220.zargabad/cfgRespawnInventory.hpp b/missions/WarlordSS220.zargabad/cfgRespawnInventory.hpp
diff --git a/missions/WarlordSS220.zargabad/description.ext b/missions/WarlordSS220.zargabad/description.ext
diff --git a/missions/WarlordSS220.zargabad/initPlayerLocal.sqf b/missions/WarlordSS220.zargabad/initPlayerLocal.sqf
@@ -8,6 +8,9 @@ player disableAI "RADIOPROTOCOL";
 // Проверка баланса команд. Относительность BLUFOR/OPFOR 1:2 - Shield
 //if ( ( west countSide allPlayers < 1) or ( east countSide allPlayers < 1) ) exitWith {};
 
+//С клиента запрос на сервер для функции запрета входа в другую команду - Kotyara
+[player] remoteExec ["SS_fnc_Server_onConnected", 2];
+
 // Даем 500 очков каждому новому игроку - Shield
 if !(_didJIP) then 
 {
@@ -26,5 +29,12 @@ if ( ( west countSide allPlayers > (east countSide allPlayers)+2) or ( east coun
 };
 */
 
-//С клиента запрос на сервер для функции запрета входа в другую команду
-[player] remoteExec ["SS_fnc_Server_onConnected", 2];
+
+//Запуск модуля динамической музыки - Shield
+if (hasInterface) then
+{
+//Сон перед первым запуском. Чтобы прошло интро и некоторое время после
+sleep 700;
+execVM "Music\musicHandler.sqf";
+};
+
diff --git a/missions/WarlordSS220.zargabad/initPlayerServer.sqf b/missions/WarlordSS220.zargabad/initPlayerServer.sqf
@@ -1,3 +1,25 @@
+// Американские лодауты - Arlord, Shield
+[west,"rifleman_us"] call BIS_fnc_addRespawnInventory;
+[west,"sniper_us"] call BIS_fnc_addRespawnInventory;
+[west,"at_us"] call BIS_fnc_addRespawnInventory;
+[west,"mg_us"] call BIS_fnc_addRespawnInventory;
+[west,"medic_us"] call BIS_fnc_addRespawnInventory;
+[west,"aa_us"] call BIS_fnc_addRespawnInventory;
+[west,"eng_us"] call BIS_fnc_addRespawnInventory;
+[west,"gren_us"] call BIS_fnc_addRespawnInventory;
+[west,"co_us"] call BIS_fnc_addRespawnInventory;
+
+// Русские лодауты - Arlord, Shield
+[east,"rifleman_ru"] call BIS_fnc_addRespawnInventory;
+[east,"sniper_ru"] call BIS_fnc_addRespawnInventory;
+[east,"mg_ru"] call BIS_fnc_addRespawnInventory;
+[east,"medic_ru"] call BIS_fnc_addRespawnInventory;
+[east,"eng_ru"] call BIS_fnc_addRespawnInventory;
+[east,"at_ru"] call BIS_fnc_addRespawnInventory;
+[east,"aa_ru"] call BIS_fnc_addRespawnInventory;
+[east,"gren_ru"] call BIS_fnc_addRespawnInventory;
+[east,"co_ru"] call BIS_fnc_addRespawnInventory;
+
 // Переасигн кураторов чтобы не было ошибки "черного экрана" - Shield
 {
 	if (!isnull (getassignedcuratorunit _x)) then {