Skip to content

Commit

Permalink
Merge pull request #3 from TacticalTrainingTeam/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@Andx667
Andx667 authored Apr 24, 2022
2 parents 88804f3 + 8b5675d commit e17fb98
Show file tree
Hide file tree
Showing 65 changed files with 2,209 additions and 1,866 deletions.
425 changes: 219 additions & 206 deletions Andx_loadouts/a_action.sqf
View file

Large diffs are not rendered by default.

119 changes: 57 additions & 62 deletions Andx_loadouts/a_init.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,68 +10,63 @@ _display = findDisplay 5000;

_listBox = _display displayCtrl 5002;

_listBox lbAdd "Grün - Zugführer";//0
_listBox lbAdd "Grün - Stellv. Zugführer";//1
_listBox lbAdd "Grün - Funker / Nachschubfeldwebel";//2
_listBox lbAdd "Grün - Forward Observer";//3
_listBox lbAdd "Grün - Joint-Terminal-Attack-Controller";//4
_listBox lbAdd "Grün - Gruppenführer";//5
_listBox lbAdd "Grün - Truppführer";//6
_listBox lbAdd "Grün - LMG-Schütze";//7
_listBox lbAdd "Grün - Grenadier";//8
_listBox lbAdd "Grün - DMR-Schütze";//9
_listBox lbAdd "Grün - Leichter AT-Schütze (NLAW)";//10
_listBox lbAdd "Grün - AT-Schütze (MAAWS)";//11
_listBox lbAdd "Grün - AT-Hilfsschütze";//12
_listBox lbAdd "Grün - Schwerer AT-Schütze (Titan)";//13
_listBox lbAdd "Grün - Schwerer AT-Hilfsschütze";//14
_listBox lbAdd "Grün - MMG-Schütze [Marksman-DLC]";//15
_listBox lbAdd "Grün - MMG-Hilfsschütze";//16
_listBox lbAdd "Grün - AA-Schütze";//17
_listBox lbAdd "Grün - AA-Hilfsschütze";//18
_listBox lbAdd "Grün - Munitonsträger";//19
_listBox lbAdd "Grün - Schütze";//20

_listBox lbAdd "Bronze - Kommandant";//21
_listBox lbAdd "Bronze - Crew";//22

_listBox lbAdd "Blau - Pionier Truppführer";//23
_listBox lbAdd "Blau - Pionier";//24

_listBox lbAdd "Gold - Aufklärer Truppführer";//25
_listBox lbAdd "Gold - Drohnenbediener";//26
_listBox lbAdd "Gold - Spotter";//27
_listBox lbAdd "Gold - Scharfschütze";//28

_listBox lbAdd "Braun - Arzt";//29
_listBox lbAdd "Braun - Sanitäter";//30

_listBox lbAdd "Platin - Pilot (Jet)";//31
_listBox lbAdd "Platin - Pilot (Helikopter)";//32

_listBox lbAdd "Weiß - Pilot";//33
_listBox lbAdd "Weiß - Arzt (Long Range)";//34
_listBox lbAdd "Weiß - Arzt";//35
_listBox lbAdd "Weiß - Sanitäter";//36

_listBox lbAdd "Silber - Pilot";//37
_listBox lbAdd "Silber - Logistiker";//38

_listBox lbAdd "Rot - Fire Direction Commander";//39
_listBox lbAdd "Rot - Mörserschütze";//40

_listBox lbAdd "TTT - Kampftaucher";//41

_listBox lbAdd "Schwarz - Zugführer (mech. Inf.)";//42
_listBox lbAdd "Schwarz - Gruppenführer (mech. Inf.)";//43
_listBox lbAdd "Schwarz - Truppführer (mech. Inf.)";//44
_listBox lbAdd "Schwarz - Crew (mech. Inf.)";//45
_listBox lbAdd "Schwarz - Grenadier (mech. Inf.)";//46
_listBox lbAdd "Schwarz - LMG-Schütze (mech. Inf.)";//47
_listBox lbAdd "Schwarz - LAT-Schütze (mech. Inf.)";//48
_listBox lbAdd "Schwarz - AT-Schütze (mech. Inf.)";//49
_listBox lbAdd "Schwarz - DMR-Schütze (mech. Inf.)";//50
_listBox lbAdd "Schwarz - Schütze (mech. Inf.)";//51
_listBox lbAdd "=== Infanterie ===";//0
_listBox lbAdd "Zugführer";//1
_listBox lbAdd "Stellv. Zugführer";//2
_listBox lbAdd "Funker / Nachschubfeldwebel";//3
_listBox lbAdd "Forward Observer";//4
_listBox lbAdd "Joint-Terminal-Attack-Controller";//5
_listBox lbAdd "Gruppenführer";//6
_listBox lbAdd "Truppführer";//7
_listBox lbAdd "LMG-Schütze";//8
_listBox lbAdd "Grenadier";//9
_listBox lbAdd "DMR-Schütze";//10
_listBox lbAdd "Leichter AT-Schütze (NLAW)";//11
_listBox lbAdd "AT-Schütze (MAAWS)";//12
_listBox lbAdd "AT-Hilfsschütze";//13
_listBox lbAdd "Schwerer AT-Schütze (Titan)";//14
_listBox lbAdd "Schwerer AT-Hilfsschütze";//15
_listBox lbAdd "MMG-Schütze [Marksman-DLC]";//16
_listBox lbAdd "MMG-Hilfsschütze";//17
_listBox lbAdd "AA-Schütze";//18
_listBox lbAdd "AA-Hilfsschütze";//19
_listBox lbAdd "Schütze";//20

_listBox lbAdd "=== gepanzerte Kräfte ===";//21
_listBox lbAdd "Bronze - Kommandant";//22
_listBox lbAdd "Bronze - Crew";//23

_listBox lbAdd "=== Kampfunterstützer ===";//24
_listBox lbAdd "Mörser Fire Direction Commander";//25
_listBox lbAdd "Mörserschütze";//26

_listBox lbAdd "Blau - Pionier Truppführer";//27
_listBox lbAdd "Blau - Pionier";//28

_listBox lbAdd "Kampftaucher";//29

_listBox lbAdd "Gold - Aufklärer Truppführer";//30
_listBox lbAdd "Gold - Aufklärer Drohnenbediener";//31
_listBox lbAdd "Gold - Spotter";//32
_listBox lbAdd "Gold - Scharfschütze";//33
_listBox lbAdd "Gold - Spotter (Anti-Material Rifle)";//34
_listBox lbAdd "Gold - Scharfschütze (Anti-Material Rifle)";//35

_listBox lbAdd "Platin - CAS-Pilot (Jet)";//36
_listBox lbAdd "Platin - CAS-Pilot (Helikopter)";//37

_listBox lbAdd "=== Nachschub ===";//38

_listBox lbAdd "Braun - Arzt";//39
_listBox lbAdd "Braun - Sanitäter";//40

_listBox lbAdd "Weiß - MedEVac-Pilot";//41
_listBox lbAdd "Weiß - Arzt (Long Range)";//42
_listBox lbAdd "Weiß - Arzt";//43
_listBox lbAdd "Weiß - Sanitäter";//44

_listBox lbAdd "Silber - Logistik-Pilot";//45
_listBox lbAdd "Silber - Logistiker";//46

_listBox lbSetColor [0, [1,1,1,1]];

Expand Down
2 changes: 1 addition & 1 deletion Andx_loadouts/dialog.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class andxRscStructuredText
{
font = "RobotoCondensed";
color = "#ffffff";
colorLink = "#D09B43";
colorLink = "#a10f2b";
align = "left";
shadow = false;
};
Expand Down
12 changes: 11 additions & 1 deletion Andx_loadouts/fn_addActions.sqf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
params ["_object"];

_object addAction ["Loadouts",{createDialog "andx_loadouts";},[],1,false,true,"","",7];
_object addAction [
"Loadouts", //Title
{createDialog "andx_loadouts";}, //Script
[], //Arguments
1, //Priority
false, //showWindow
true, //hideonuse
"", //shortcut
"", //condition
11 //radius
];
150 changes: 134 additions & 16 deletions initPlayerLocal.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,16 @@
// spectator cam and clean up near base
flag_sammelplatz addAction ["Zuschauermodus", {
params ["_target","_caller"];

["Initialize", [_caller, [], true]] call BIS_fnc_EGSpectator;
},[],1,false,true,"","",5];
},
[],1,false,true,"","",5

];

player addEventHandler ["Respawn",{
params ["","_corpse"];

if((getPosASL player) distance (getMarkerPos "respawn") < 1000) then {
deleteVehicle _corpse;
};
Expand All @@ -62,11 +68,11 @@ laptopHangar_1 addAction ["Gruppe - Keil",{boardHangar_1 setObjectTextureGlobal
laptopHangar_1 addAction ["Gruppe - Kette",{boardHangar_1 setObjectTextureGlobal [0, "formationen\08_gruppe_Schutzenkette.paa"];},[],1,false,true,"","",5];
laptopHangar_1 addAction ["Gruppe - Reihe",{boardHangar_1 setObjectTextureGlobal [0, "formationen\09_gruppe_schutzenreihe.paa"];},[],1,false,true,"","",5];

//Nummern wechseln an TTT Schild
//Nummern/Tarn/Farbe wechseln an TTT Schild
{
_x addAction
_x addAction
[
"Werde 1", // title
"Werde Nummer 1", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

Expand All @@ -76,7 +82,7 @@ laptopHangar_1 addAction ["Gruppe - Reihe",{boardHangar_1 setObjectTextureGlobal

_x addAction
[
"Werde 2", // title
"Werde Nummer 2", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

Expand All @@ -86,7 +92,7 @@ laptopHangar_1 addAction ["Gruppe - Reihe",{boardHangar_1 setObjectTextureGlobal

_x addAction
[
"Werde 3", // title
"Werde Nummer 3", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

Expand All @@ -96,37 +102,37 @@ laptopHangar_1 addAction ["Gruppe - Reihe",{boardHangar_1 setObjectTextureGlobal

_x addAction
[
"Werde 4", // title
"Werde Nummer 4", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["helm", "4"];
}
];

_x addAction
_x addAction
[
"Werde 5", // title
"Werde Nummer 5", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["helm", "5"];
}
];

_x addAction
_x addAction
[
"Werde 6", // title
"Werde Nummer 6", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["helm", "6"];
}
];

_x addAction
_x addAction
[
"Werde 7", // title
"Werde Nummer 7", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

Expand All @@ -136,7 +142,7 @@ laptopHangar_1 addAction ["Gruppe - Reihe",{boardHangar_1 setObjectTextureGlobal

_x addAction
[
"Werde 8", // title
"Werde Nummer 8", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

Expand All @@ -146,21 +152,133 @@ laptopHangar_1 addAction ["Gruppe - Reihe",{boardHangar_1 setObjectTextureGlobal

_x addAction
[
"Werde 9", // title
"Werde Nummer 9", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["helm", "9"];
}
];

_x addAction
[
"Werde Gelb", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "yellow"];
}
];

_x addAction
[
"Werde Gold", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "gold"];
}
];

_x addAction
[
"Werde Grau", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "grey"];
}
];

_x addAction
[
"Werde Grün", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "green"];
}
];

_x addAction
[
"Werde Orange", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "orange"];
}
];

_x addAction
[
"Werde Rot", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "red"];
}
];


_x addAction
[
"Werde Schwarz", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "black"];
}
];

_x addAction
[
"Werde Violett", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["farbe", "violet"];
}
];

_x addAction
[
"TTT Flecktarn", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["tarn", "BW_Flecktarn"];
}
];

_x addAction
[
"TTT Tropentarn", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

_caller setVariable ["tarn", "BW_Tropentarn"];
}
];

_x addAction
[
"Schalldämpfer ausrüsten", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

[_caller] spawn compile preprocessFileLineNumbers "loadouts\Suppressor.sqf";
hint "Schalldämpfer ausgerüstet.";
}
];

_x addAction
[
"Fallschirm ausrüsten", // title
{
params ["_target", "_caller", "_actionId", "_arguments"]; // script

[_caller] spawn compile preprocessFileLineNumbers "loadouts\TTT_Parachute.sqf";
[_caller] spawn compile preprocessFileLineNumbers "loadouts\Parachute.sqf";
hint "Fallschirm und Höhenmesser ausgerüstet.";
}
];
Expand Down
Loading

0 comments on commit e17fb98

Please sign in to comment.