Gemeinsame Servermod für Livonia und Virolathi

formtapez · web-flow · commit eef871cf9c6a · 2021-05-13T12:46:06.000+02:00
diff --git a/addons/main/GELDZEIT/fn_clientInitcbaclassevents.sqf b/addons/main/GELDZEIT/fn_clientInitcbaclassevents.sqf
@@ -14,21 +14,22 @@
 */
 #include "macros.hpp"
 
-["LandVehicle", "init", 
+// Haftladungen (aber nicht auf der Livonia-Karte!)
+if !("Enoch" isEqualTo worldName) then
 {
-    params ["_vec"];
-
-    _vec addAction [
-        format["<t color=""#f0f24e"">%1</t>", MLOC(HAFTLADUNG)], 
-        {[_this select 0] call FUNC(haftladungen)},
-        [], 
-        -1, 
-        false, 
-        true, 
-        '',
-        "_veh = vehicle _this; ((alive _target) and (speed _veh < 3) and (_veh distance _target) < 8 and vehicle player == player)"
-    ];
-
-}, nil, nil, true] call CBA_fnc_addClassEventHandler;
-
+    ["LandVehicle", "init", 
+    {
+        params ["_vec"];
 
+        _vec addAction [
+            format["<t color=""#f0f24e"">%1</t>", MLOC(HAFTLADUNG)], 
+            {[_this select 0] call FUNC(haftladungen)},
+            [], 
+            -1, 
+            false, 
+            true, 
+            '',
+            "_veh = vehicle _this; ((alive _target) and (speed _veh < 3) and (_veh distance _target) < 8 and vehicle player == player)"
+        ];
+    }, nil, nil, true] call CBA_fnc_addClassEventHandler;
+};
diff --git a/addons/main/GELDZEIT/fn_haftladungen.sqf b/addons/main/GELDZEIT/fn_haftladungen.sqf
@@ -1,6 +1,6 @@
 /**
 * Description:
-* Stellt Haftladungen zur verfügung
+* Stellt Haftladungen zur Verfügung
 * 
 * Author: Lord-MDB
 * 
@@ -34,38 +34,38 @@ private _pic = "A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
 _veh = (nearestObjects[_unit,["car","truck","tank","wheeled_apc"],8]) select 0;
 _bomb = (nearestObject [_unit, 'PipeBombBase']);
 
-//check ob Beide nötigen Dinge vorhanden sind
-if (isNull _veh) exitWith {Hint format["%1",MLOC(HAFTLADUNGNOVEH)];};
-if (isNull _bomb) exitWith {Hint format["%1",MLOC(HAFTLADUNGNOBOMBE)];};
+// Check ob Beide nötigen Dinge vorhanden sind
+if (isNull _veh) exitWith {hint format["%1",MLOC(HAFTLADUNGNOVEH)];};
+if (isNull _bomb) exitWith {hint format["%1",MLOC(HAFTLADUNGNOBOMBE)];};
 
-if ((_bomb distance _veh) > 8) exitWith {Hint format["%1",MLOC(HAFTLADUNGNOBOMBE)];};
+if ((_bomb distance _veh) > 8) exitWith {hint format["%1",MLOC(HAFTLADUNGNOBOMBE)];};
 
-//Roherfassung Objekt
-private _start = AGLToASL positionCameraToWorld [0,0,0];
-private _end   = AGLToASL positionCameraToWorld [0,0,10];
+// Roherfassung Objekt
+private _start = AGLToASL positionCameraToWorld [0, 0, 0];
+private _end = AGLToASL positionCameraToWorld [0, 0, 10];
 private _lis = lineIntersectsSurfaces [_start, _end, _unit, objNull, true, -1];
 private _intersection = _lis param [0, []] select 0;
 
-//Check Fahrzeug gefunden wurde
-if (isNil "_intersection") exitWith {Hint format["%1",MLOC(HAFTLADUNGNOVEH)];};
-if (_intersection isEqualTo []) exitWith {Hint format["%1",MLOC(HAFTLADUNGNOVEH)];};
+// Check ob Fahrzeug gefunden wurde
+if (isNil "_intersection") exitWith {hint format["%1",MLOC(HAFTLADUNGNOVEH)];};
+if (_intersection isEqualTo []) exitWith {hint format["%1",MLOC(HAFTLADUNGNOVEH)];};
 
-//Netto Position des Fahrzeugs
+// Netto Position des Fahrzeugs
 private _vDir = _start vectorFromTo _end;
-private _position = _intersection vectorAdd (_vDir vectorMultiply +(0.9 * abs(cos (getDir _veh + 90)))); //90cm abstand 
+private _position = _intersection vectorAdd (_vDir vectorMultiply + (0.9 * abs(cos(getDir _veh + 90)))); // 90 cm abstand 
 private _offset = _veh worldToModel ASLToAGL _position;
 
-private _xoffset = (_offset select 0);
-private _yoffset = (_offset select 1);
+private _xoffset = _offset select 0;
+private _yoffset = _offset select 1;
 private _zoffset = _offset select 2;
 
 // Anheften der Sprengladung mit Offset
-_bomb attachTo [_veh, [_xoffset,_yoffset,_zoffset]];
+_bomb attachTo [_veh, [_xoffset, _yoffset, _zoffset]];
 
-//Ausrichten der Sprengladung 
+// Ausrichten der Sprengladung 
 private _unitdir = getDir _unit;
-_bomb setVectorDirAndUp [[0,(cos (getDir _veh + 90)),0],[(cos (getDir _veh - 90 +_unitdir)),(cos (getDir _veh + 90 + _unitdir)),0]];
+_bomb setVectorDirAndUp [[0, (cos(getDir _veh + 90)), 0], [(cos(getDir _veh - 90 + _unitdir)), (cos(getDir _veh + 90 + _unitdir)), 0]];
 
-//Ausgabe an den Spieler
+// Ausgabe an den Spieler
 _pic = "A3\Weapons_F\Data\UI\gear_c4_charge_small_CA.paa";
 hint composeText [parseText format ["<t align='left' size='%4'><img image='%3'></t>" +"<t align='center' size='1.25' shadow='true'>%1</t><t align='right' size='%4'><img image='%3'></t>" +"<br/>" +"<t align='center' size='1.0' shadow='true'>%2</t>","C4",MLOC(HAFTLADUNGATTACH),_pic,3.0]];
diff --git a/addons/main/RULES/fn_clientInit.sqf b/addons/main/RULES/fn_clientInit.sqf
@@ -28,9 +28,6 @@
 */
 #include "macros.hpp"
 
-// Spieler wird getötet wenn er sich zu nah an eine Feindbasis wagt
-#define MIN_DISTANCE_TO_ENEMYBASE 2000
-
 // Wie oft (in Sekunden) wird die Spielerposition geprüft
 #define INTERVAL_DISTANCE_CHECK 15
 
@@ -181,7 +178,7 @@
                     case east:
                     {
                         [{
-                            if (((player distance2D getMarkerPos "AAF_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "AAF_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then
+                            if ((position player inArea "AAF_T_Zone1") or (position player inArea "AAF_T_Zone2")) then
                             {
                                 player setDamage 1;
                                 [MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2]; 
@@ -192,7 +189,7 @@
                     case independent:
                     {
                         [{
-                            if (((player distance2D getMarkerPos "CSAT_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "CSAT_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then
+                            if ((position player inArea "CSAT_T_Zone1") or (position player inArea "CSAT_T_Zone2")) then
                             {
                                 player setDamage 1;
                                 [MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2]; 
@@ -209,7 +206,7 @@
                     case east:
                     {
                         [{
-                            if (((player distance2D getMarkerPos "NATO_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "NATO_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then
+                            if ((position player inArea "NATO_T_Zone1") or (position player inArea "NATO_T_Zone2")) then
                             {
                                 player setDamage 1;
                                 [MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2]; 
@@ -220,7 +217,7 @@
                     case west:
                     {
                         [{
-                            if (((player distance2D getMarkerPos "CSAT_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "CSAT_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then
+                            if ((position player inArea "CSAT_T_Zone1") or (position player inArea "CSAT_T_Zone2")) then
                             {
                                 player setDamage 1;
                                 [MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2]; 
@@ -237,7 +234,7 @@
                     case independent:
                     {
                         [{
-                            if (((player distance2D getMarkerPos "NATO_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "NATO_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then
+                            if ((position player inArea "NATO_T_Zone1") or (position player inArea "NATO_T_Zone2")) then
                             {
                                 player setDamage 1;
                                 [MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2]; 
@@ -248,7 +245,7 @@
                     case west:
                     {
                         [{
-                            if (((player distance2D getMarkerPos "AAF_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "AAF_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then
+                            if ((position player inArea "AAF_T_Zone1") or (position player inArea "AAF_T_Zone2")) then
                             {
                                 player setDamage 1;
                                 [MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2]; 
diff --git a/addons/main/SECTORCONTROL/fn_clientinitplayereh.sqf b/addons/main/SECTORCONTROL/fn_clientinitplayereh.sqf
@@ -63,13 +63,25 @@ if (GVAR(trainingon)) then
         
     }] call BIS_fnc_addStackedEventHandler;
 
+    // Teleport funktion
     player addAction [("<t color=""#f0bfbfbf"">" + ("Teleport") + "</t>"), {[] call FUNC(teleport)}, [], 0, false, true, '', "alive _target"];
-    player addAction ["<t color='#FF0000'>Virtual Arsenal</t>", {["Open", true] spawn BIS_fnc_arsenal;}, [], 5, false, true];
+    
+    // Virtuelles Arsenal (aber nicht auf der Livonia-Karte!)
+    if !("Enoch" isEqualTo worldName) then
+    {
+        player addAction ["<t color='#FF0000'>Virtual Arsenal</t>", {["Open", true] spawn BIS_fnc_arsenal;}, [], 5, false, true];
+    };
 
     ["Respawn",
     {
+        // Teleport funktion
         player addAction [("<t color=""#f0bfbfbf"">" + ("Teleport") + "</t>"), {[] call FUNC(teleport)}, [], 0, false, true, '', "alive _target"];
-        player addAction ["<t color='#FF0000'>Virtual Arsenal</t>", {["Open", true] spawn BIS_fnc_arsenal;}, [], 5, false, true];
+
+        // Virtuelles Arsenal (aber nicht auf der Livonia-Karte!)
+        if !("Enoch" isEqualTo worldName) then
+        {
+            player addAction ["<t color='#FF0000'>Virtual Arsenal</t>", {["Open", true] spawn BIS_fnc_arsenal;}, [], 5, false, true];
+        };
     }] call CFUNC(addEventhandler);
 };
 
diff --git a/addons/main/SECTORCONTROL/fn_drawsectormarkers.sqf b/addons/main/SECTORCONTROL/fn_drawsectormarkers.sqf
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,6 @@`
`28`	`28`	`*/`
`29`	`29`	`#include "macros.hpp"`
`30`	`30`
`31`		`-// Spieler wird getötet wenn er sich zu nah an eine Feindbasis wagt`
`32`		`-#define MIN_DISTANCE_TO_ENEMYBASE 2000`
`33`		`-`
`34`	`31`	`// Wie oft (in Sekunden) wird die Spielerposition geprüft`
`35`	`32`	`#define INTERVAL_DISTANCE_CHECK 15`
`36`	`33`
`@@ -181,7 +178,7 @@`
`181`	`178`	`case east:`
`182`	`179`	`{`
`183`	`180`	`[{`
`184`		`- if (((player distance2D getMarkerPos "AAF_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "AAF_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then`
	`181`	`+ if ((position player inArea "AAF_T_Zone1") or (position player inArea "AAF_T_Zone2")) then`
`185`	`182`	`{`
`186`	`183`	`player setDamage 1;`
`187`	`184`	`[MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2];`
`@@ -192,7 +189,7 @@`
`192`	`189`	`case independent:`
`193`	`190`	`{`
`194`	`191`	`[{`
`195`		`- if (((player distance2D getMarkerPos "CSAT_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "CSAT_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then`
	`192`	`+ if ((position player inArea "CSAT_T_Zone1") or (position player inArea "CSAT_T_Zone2")) then`
`196`	`193`	`{`
`197`	`194`	`player setDamage 1;`
`198`	`195`	`[MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2];`
`@@ -209,7 +206,7 @@`
`209`	`206`	`case east:`
`210`	`207`	`{`
`211`	`208`	`[{`
`212`		`- if (((player distance2D getMarkerPos "NATO_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "NATO_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then`
	`209`	`+ if ((position player inArea "NATO_T_Zone1") or (position player inArea "NATO_T_Zone2")) then`
`213`	`210`	`{`
`214`	`211`	`player setDamage 1;`
`215`	`212`	`[MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2];`
`@@ -220,7 +217,7 @@`
`220`	`217`	`case west:`
`221`	`218`	`{`
`222`	`219`	`[{`
`223`		`- if (((player distance2D getMarkerPos "CSAT_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "CSAT_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then`
	`220`	`+ if ((position player inArea "CSAT_T_Zone1") or (position player inArea "CSAT_T_Zone2")) then`
`224`	`221`	`{`
`225`	`222`	`player setDamage 1;`
`226`	`223`	`[MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2];`
`@@ -237,7 +234,7 @@`
`237`	`234`	`case independent:`
`238`	`235`	`{`
`239`	`236`	`[{`
`240`		`- if (((player distance2D getMarkerPos "NATO_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "NATO_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then`
	`237`	`+ if ((position player inArea "NATO_T_Zone1") or (position player inArea "NATO_T_Zone2")) then`
`241`	`238`	`{`
`242`	`239`	`player setDamage 1;`
`243`	`240`	`[MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2];`
`@@ -248,7 +245,7 @@`
`248`	`245`	`case west:`
`249`	`246`	`{`
`250`	`247`	`[{`
`251`		`- if (((player distance2D getMarkerPos "AAF_T_Zone1") < MIN_DISTANCE_TO_ENEMYBASE) or ((player distance2D getMarkerPos "AAF_T_Zone2") < MIN_DISTANCE_TO_ENEMYBASE)) then`
	`248`	`+ if ((position player inArea "AAF_T_Zone1") or (position player inArea "AAF_T_Zone2")) then`
`252`	`249`	`{`
`253`	`250`	`player setDamage 1;`
`254`	`251`	`[MLOC(BASE_DISTANCE)] remoteExecCall ["hint", -2];`