Skip to content
This repository has been archived by the owner on Dec 1, 2021. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbphoenix
mbphoenix committed Oct 3, 2018
2 parents db37d53 + aa78774 commit 6cabced
Show file tree
Hide file tree
Showing 17 changed files with 61,436 additions and 52,422 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@
- cargosystem für modupdate angepasst -> setcargoandspace.sqf
- warehouse für modupdate angepasst -> setupvehiclepool.sqf
- MHQ tarnnetze aus komposition entfernt - aber immer noch scheisse aufzubauen!
- Warehouse: Ab sofort gibt es eine verbesserte Möglichkeit, für Wracks Garbage Collectoren (Trigger) zu platzieren. Somit sind ab sofort alle Basen und Flugfelder mit Triggern ausgestattet, die zerstörte Wracks automatische löschen. Früher gab es nur einen kreisrunden Bereich um die Basis, jetzt beliebige Flächen möglich
- ifrit hmg und gmg in waffenscript gefixt - erlaubte vehikelliste in der waffenconfig.hpp
- bewaffnungspads für extrabasen nachgetragen - in postinit.sqf

## Editor

- Neue Version mit je zwei diagonalen Basen
- loadoutanpassungen bei allen infern (mündungsfeuerbremse, handguns raus, primärwaffenmuni +2, SQLs nun mit 40mm HE etc, Recon-AT NATO wieder mit schalli)
- neue flaggenposi-baukram von oppa eingebaut
- marker in basen überprüft und angepasst (teleport csat, diverse verschiebungen)

## 1.4.13

Expand Down
48 changes: 22 additions & 26 deletions [J]OPT.lythium/beam/functions/fnc_setup_beamOrte.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,33 +164,29 @@ GVAR(locations_east) =


GVAR(heavy_vehicles) = [
"OPT_O_T_APC_Wheeled_02_rcws_ghex_F", // MSE-3 Marid
"OPT_O_APC_Wheeled_03_cannon_light_F", // AFV-4 Gorgon (Leicht)
"OPT_O_APC_Wheeled_03_cannon_F", // AFV-4 Gorgon
"OPT_O_T_APC_Tracked_02_AA_ghex_F", // ZSU-39 Tigris
"OPT_O_T_APC_Tracked_02_cannon_ghex_light_F", // BTR-K Kamysh
"OPT_O_T_APC_Tracked_02_cannon_ghex_F", // BTR-K Kamysh (Titan)
"OPT_O_T_MBT_02_cannon_ghex_F", // T-100 Varsuk
"OPT_O_T_MBT_02_arty_ghex_F", // 2S9 Sochor
//vanilla
"OPT_O_APC_Wheeled_02_rcws_F", // MSE-3 Marid
"OPT_O_APC_Tracked_02_AA_F", // ZSU-39 Tigris
"OPT_O_APC_Tracked_02_cannon_light_F", // BTR-K Kamysh
"OPT_O_APC_Tracked_02_cannon_F", // BTR-K Kamysh (Titan)
"OPT_O_MBT_02_cannon_F", // T-100 Varsuk
"OPT_O_MBT_02_arty_F", // 2S9 Sochor
//Vanilla
"OPT4_O_APC_Wheeled_02_rcws_F", // MSE-3 Marid
"OPT_O_APC_Wheeled_03_cannon_light_F", // AFV-4 Gorgon (Leicht)
"OPT4_O_APC_Wheeled_03_cannon_F", // AFV-4 Gorgon
"OPT4_O_APC_Tracked_02_AA_F", // ZSU-39 Tigris
"OPT_O_APC_Tracked_02_cannon_light_F", // BTR-K Kamysh
"OPT4_O_APC_Tracked_02_cannon_F", // BTR-K Kamysh (Titan)
"OPT4_O_MBT_02_cannon_F", // T-100 Varsuk
"OPT4_O_MBT_02_arty_F", // 2S9 Sochor

"OPT_B_APC_Tracked_01_rcws_F", // IFV-6c Panther
"OPT_B_APC_Wheeled_01_cannon_light_F", // AMV-7 Marshall (Leicht)
"OPT_B_APC_Wheeled_01_cannon_F", // AMV-7 Marshall
"OPT_B_APC_Tracked_01_AA_F", // IFV-6a Cheetah
"OPT_B_APC_tracked_03_cannon_F", // FV-720 Mora
"OPT_B_MBT_01_cannon_F", // M2A4 Slammer
"OPT_B_MBT_01_TUSK_F", // M2A4 SlammerUp
"OPT_B_MBT_03_cannon_F", // MBT-52 Kuma, fliegt raus
"OPT_B_MBT_01_Arty_F", // M4 Scorcher
"OPT_B_MBT_01_mlrs_F"
];
"OPT4_B_APC_Tracked_01_rcws_F", // IFV-6c Panther
"OPT_B_APC_Wheeled_01_cannon_light_F", // AMV-7 Marshall (Leicht)
"OPT4_B_APC_Wheeled_01_cannon_F", // AMV-7 Marshall
"OPT4_B_APC_Tracked_01_AA_F", // IFV-6a Cheetah
"OPT4_B_APC_tracked_03_cannon_F", // FV-720 Mora
"OPT4_B_MBT_01_cannon_F", // M2A4 Slammer
"OPT4_B_MBT_01_TUSK_F", // M2A4 SlammerUp
"OPT_B_MBT_03_cannon_F", // MBT-52 Kuma, fliegt raus
"OPT_B_MBT_01_Arty_F", // M4 Scorcher
"OPT4_B_MBT_01_mlrs_F", // M4 Scorcher
"OPT4_B_MBT_01_arty_F", // M4 Scorcher
"OPT_B_MBT_01_mlrs_F" // M5 Sandstorm
];


/* List of triggers in Editor for beam functionality */
Expand Down
21 changes: 13 additions & 8 deletions [J]OPT.lythium/cargo/functions/fnc_setupCargoSpaceAndSize.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,21 @@ GVAR(canTransportCargo) =
["OPT_B_G_Offroad_01_armed_F", 4], // Pickup HMG - grad nich drin!
["OPT_B_T_LSV_01_unarmed_F", 4], // Prowler unarmed
["OPT_B_T_LSV_01_armed_F", 4], // Prowler armed
["OPT_B_T_LSV_01_AT_F_un", 4], // Prowler AT - vanilla - lord
["B_T_LSV_01_AT_F", 4], // Prowler AT - vanilla - lord
["OPT_B_MRAP_03_F", 4], // Strider - grad nich drin!
["OPT_B_MRAP_03_hmg_F", 4], // Strider HMG - grad nich drin!
["OPT_B_MRAP_03_gmg_F", 4], // Strider GMG
["OPT4_B_MRAP_03_gmg_F", 4], // Strider GMG
["OPT_B_MRAP_01_F", 4], // Hunter
["OPT_B_MRAP_01_hmg_F", 4], // Hunter HMG
["OPT_B_MRAP_01_gmg_F", 4], // Hunter GMG
["OPT4_B_MRAP_01_hmg_F", 4], // Hunter HMG - neu
["OPT4_B_MRAP_01_gmg_F", 4], // Hunter gMG - neu
["OPT4_B_MRAP_01_hmg_F", 4], // Hunter HMG
["OPT4_B_MRAP_01_gmg_F", 4], // Hunter GMG
["OPT_B_Truck_01_covered_F", 6], // HEMTT Inf-Transport
["OPT_B_Truck_01_transport_F", 8], // HEMTT Logistik - hinzugefügt
// NATO Armored
["OPT_B_APC_Wheeled_01_cannon_F", 4], // AMV-7 Marshall
["OPT4_B_APC_Wheeled_01_cannon_F", 4], // AMV-7 Marshall - neu
["OPT_B_APC_Wheeled_01_cannon_light_F", 4], // AMV-7 Marshall (Leicht)
["OPT_B_MBT_01_cannon_F", 4], // M2A4 Slammer
["OPT4_B_MBT_01_cannon_F", 4], // M2A4 Slammer - neu
["OPT_B_MBT_01_TUSK_F", 4], // M2A4 SlammerUp
["OPT4_B_MBT_01_TUSK_F", 4], // M2A4 SlammerUp - neu
["OPT_B_APC_Tracked_01_rcws_F", 4], // IFV-6c Panther von 30
Expand All @@ -78,11 +77,15 @@ GVAR(canTransportCargo) =
["OPT4_B_APC_tracked_03_cannon_F", 4], // FV-720 Mora - neu
// NATO Helicopters
["OPT_B_Heli_Light_01_F", 4], // MH-9 Hummingbird
["OPT_B_Heli_light_03_unarmed_green_F", 4], // Hellcat unbew
["OPT4_B_Heli_light_03_green_F", 4], // Hellcat bew
["OPT_B_Heli_Transport_01_F", 4], // UH-80 Ghosthawk von 30
["OPT_B_Heli_Transport_02_F", 8], // CH-49 Mohawk (Transport+Lift) von 30
["OPT_B_Heli_Transport_03_unarmed_F", 8], // CH-67 Huron unarmed (Transport+Lift) von 30
["OPT_B_Heli_Transport_03_F", 8], // CH-67 Huron armed (Transport+Lift) von 30
["OPT_B_T_VTOL_01_infantry_F", 4], // Blackfish (Inf-Transport) - hinzugefügt
["OPT_B_T_VTOL_01_infantry_F", 4], // Blackfish (Inf-Transport) - grad nicht drin!
["OPT_B_T_VTOL_01_vehicle_F", 4], // Blackfish (Vehikel-Transport)
["OPT_B_T_VTOL_02_infantry_unarmed_F", 4], // Xian (Inf-Transport) - hinzugefügt
// NATO ships
["OPT_B_Boat_Transport_01_F", 2], // Assault Boat - hinzugefügt
["OPT_B_Boat_Armed_01_minigun_F", 4], // Speedboat Minigun - hinzugefügt
Expand All @@ -93,7 +96,7 @@ GVAR(canTransportCargo) =
["OPT_O_T_Quadbike_01_ghex_F", 2], // Quadbike - checken!
["OPT_O_T_LSV_02_unarmed_F", 4], // Quilin unarmed
["OPT_O_T_LSV_02_armed_F", 4], // Quilin armed
["OPT_O_T_LSV_01_AT_F_un", 4], // Prowler AT - vanilla - lord
["O_T_LSV_01_AT_F_un", 4], // Prowler AT - vanilla - lord
["OPT_O_G_Offroad_01_F", 4], // Pickup - grad nich drin!
["OPT_O_G_Offroad_01_armed_F", 4], // Pickup HMG - grad nich drin!
["OPT_O_T_MRAP_02_ghex_F", 4], // Ifrit - tropentarn hinzugefügt
Expand Down Expand Up @@ -131,9 +134,11 @@ GVAR(canTransportCargo) =
["OPT_O_Heli_Light_02_unarmed_F", 4], // PO-30 Orca,100000
["OPT_O_Heli_Light_02_unarmed_black_F", 4], // PO-30 Orca,100000
["OPT4_O_Heli_Light_02_F", 4], // orca - neu
["sfp_bo105_unarmed", 4], // BO105 - neu
["OPT_O_Heli_Transport_04_covered_F", 8], // Mi-290 Taru (Transport),110000
["OPT_O_Heli_Transport_04_covered_black_F", 8], // Mi-290 Taru (Transport),110000
["OPT_O_T_VTOL_02_infantry_unarmed_F", 4], // Y-32 Xi'an (Inf-Transport), 180000
["OPT_O_T_VTOL_01_vehicle_F", 4], // Blackfish (Vehikel-Transport), 180000
// CSAT Supplies
["OPT_O_T_UGV_01_ghex_F", 6], // UGV Saif
//vanilla
Expand Down
166 changes: 89 additions & 77 deletions [J]OPT.lythium/main/functions/fnc_setup_classnames.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,52 +25,62 @@ GVARMAIN(pilots) = [
];

GVARMAIN(pilots_vecs) = [
"OPT_B_Heli_Light_01_F", // MH-9 Hummingbird,70000
"OPT_B_Heli_Light_01_armed_F", // AH-9 Pawnee,150000
"OPT_B_Heli_Light_01_armed_2_F", // AH-9 Pawnee DAGR,350000 - erstma raus wegen DAGR-problematik
"OPT_B_Heli_Transport_01_F", // UH-80 Ghosthawk,130000
"OPT_B_Heli_Transport_02_F", // CH-49 Mohawk (Transport+Lift),150000
"OPT_B_Heli_Attack_01_F", // AH-99 Blackfoot,750000
"OPT_B_Heli_Transport_03_unarmed_F", // CH-67 Huron unarmed (Transport+Lift),150000
"OPT_B_Heli_Transport_03_F", // CH-67 Huron armed (Transport+Lift),170000
"OPT_B_Plane_CAS_01_F", // A-164 Wipeout,540000
"OPT_B_T_VTOL_01_infantry_F", // Blackfish (Inf-Transport)
"OPT_B_T_VTOL_01_vehicle_F", // Blackfish (Fahrzeug-Transport)
"OPT_B_T_VTOL_01_armed_F", // Blackfish BEWAFFNET
"OPT_B_Plane_Fighter_AA_01_F", // F/A-181 Black Wasp II (AA)
"OPT_O_Heli_Light_03_unarmed_F", // WY-55 Hellcat,70000
"OPT_O_Heli_Light_03_unarmed_green_F", // WY-55 Hellcat,70000
"OPT_O_Heli_Light_03_F", // WY-55 Hellcat (DAR),170000
"OPT_O_Heli_Light_03_green_F", // WY-55 Hellcat (DAR),170000
"OPT_O_Heli_Light_02_unarmed_F", // PO-30 Orca,100000
"OPT_O_Heli_Light_02_unarmed_black_F", // PO-30 Orca,100000
"OPT_O_Heli_Light_02_v2_F", // PO-30 Orca (DAR),200000
"OPT_O_Heli_Light_02_v2_black_F", // PO-30 Orca (DAR),200000
"OPT_O_Heli_Light_02_F", // PO-30 Orca (DAGR),400000 - erstma raus wegen DAGR-problematik
"OPT_O_Heli_Light_02_black_F", // PO-30 Orca (DAGR),400000 - erstma raus wegen DAGR-problematik
"OPT_O_Heli_Transport_04_F", // Mi-290 Taru (Lift),85000
"OPT_O_Heli_Transport_04_black_F", // Mi-290 Taru (Lift),85000
"OPT_O_Heli_Transport_04_bench_F", // Mi-290 Taru (Bench),90000
"OPT_O_Heli_Transport_04_bench_black_F", // Mi-290 Taru (Bench),90000
"OPT_O_Heli_Transport_04_covered_F", // Mi-290 Taru (Transport),110000
"OPT_O_Heli_Transport_04_covered_black_F", // Mi-290 Taru (Transport),110000
"OPT_O_Heli_Transport_02_F", // CH-49 Mohawk (Transport+Lift),150000
"OPT_O_Heli_Attack_02_F", // Mi-48 Kajman,800000
"OPT_O_Heli_Attack_02_black_F", // Mi-48 Kajman (Schwarz),800000
"OPT_O_Plane_Fighter_03_CAS_F", // A-143 Buzzard (CAS),450000
"OPT_O_Plane_Fighter_03_AA_F", // A-143 Buzzard (AA),500000
"OPT_O_Plane_CAS_02_F", // To-199 Neophron,560000
"OPT_O_T_VTOL_02_infantry_F", // Y-32 Xi'an (Inf-Transport), 180000
"OPT_O_T_VTOL_02_vehicle_F", // Y-32 Xi'an (Fahrzeug-Transport), 200000
"OPT_O_T_VTOL_02_infantry_unarmed_F", // Y-32 Xi'an (Inf-Transport), 180000
"OPT_O_T_VTOL_02_vehicle_unarmed_F", // Y-32 Xi'an (Fahrzeug-Transport), 180000
"OPT_O_Plane_Fighter_AA_02_F", // To-201 Shikra (AA), 180000
"OPT_O_Heli_Light_03_F_un",
"OPT_B_Heli_Light_01_armed_F_un",
"OPT_B_Heli_Attack_01_F_un",
"sfp_bo105_unarmed",
"OPT_O_Heli_Light_02_F_un",
"OPT_O_Heli_Attack_02_F_un"
"OPT4_B_Heli_light_03_green_F", // WY-55 Hellcat (Unbewaffnet)
"OPT_B_Heli_Light_01_F", // MH-9 Hummingbird
"OPT4_B_Heli_Light_01_armed_F", // AH-9 Pawnee (Unbewaffnet) - 80000
"OPT_B_Heli_Light_01_armed_2_F", // AH-9 Pawnee scalpel
"OPT_B_Heli_Transport_01_F", // UH-80 Ghosthawk
"OPT_B_Heli_Transport_03_unarmed_F", // CH-67 Huron unarmed (Transport+Lift)
"OPT_B_Heli_Transport_03_F", // CH-67 Huron armed (Transport+Lift)
"OPT_B_Heli_Transport_02_F", // CH-49 Mohawk (Transport+Lift)
"OPT_B_T_UAV_03_dynamicLoadout_F", // MQ12-Falcon - noch in arbeit erstma nur testweise mit preis eingebaut
"OPT_B_T_VTOL_02_infantry_unarmed_F", // VTOL Y-32 Xi'an (Inf-Transport)
"OPT_B_T_VTOL_01_infantry_F", // VTOL Blackfish (Inf-Transport) 200000
"OPT_B_T_VTOL_01_vehicle_F", // VTOL Blackfish (Fahrzeug-Transport)
"OPT_B_T_VTOL_01_armed_F", // VTOL Blackfish BEWAFFNET
"OPT4_B_Heli_Attack_01_F", // AH-99 Blackfoot 200000(Unbewaffnet)
"OPT_B_Plane_CAS_01_F", // A-164 Wipeout
"OPT_B_Plane_Fighter_AA_01_F", // F/A-181 Black Wasp II (AA)
"OPT_B_Plane_Fighter_03_AA_F_1", // Buzzard AA
"OPT_B_Plane_CAS_01_F_1", // A-164 Wipeout
"sfp_bo105_unarmed", // BO 105 - testweise eingebaut - textur klären!
"OPT_O_Heli_Light_03_unarmed_F", // WY-55 Hellcat
"OPT4_O_Heli_light_03_F", // WY-55 Hellcat
"OPT_O_Heli_Light_03_unarmed_green_F", // WY-55 Hellcat - 60000
"OPT_O_Heli_Light_03_green_F", // WY-55 Hellcat (DAR)
"OPT_O_Heli_light_03_Scalpel_green_F", // WY-55 Hellcat (scalpel)
"OPT_O_Heli_light_03_Scalpel_F", // WY-55 Hellcat (scalpel)
"OPT_O_Heli_Light_02_unarmed_F", // PO-30 Orca
"OPT_O_Heli_Light_02_unarmed_black_F", // PO-30 Orca
"OPT_O_Heli_Light_02_Minigun_F", // PO-30 Orca minigun 90000
"OPT_O_Heli_Light_02_Minigun_black_F", // PO-30 Orca minigun 90000
"OPT4_O_Heli_Light_02_F", // PO-30 Orca (Unbewaffnet)
"OPT4_O_Heli_Light_02_black_F", // PO-30 Orca (DAR)
"OPT_O_Heli_Light_02_F", // PO-30 Orca (scalpel)
"OPT_O_Heli_Light_02_black_F", // PO-30 Orca (scalpel)
"OPT_O_Heli_Transport_04_F", // Mi-290 Taru (Lift)
"OPT_O_Heli_Transport_04_black_F", // Mi-290 Taru (Lift)
"OPT_O_Heli_Transport_04_covered_F", // Mi-290 Taru (Transport)
"OPT_O_Heli_Transport_04_covered_black_F", // Mi-290 Taru (Transport)
"OPT_O_Heli_Transport_04_bench_F", // Mi-290 Taru (Bench)
"OPT_O_Heli_Transport_04_bench_black_F", // Mi-290 Taru (Bench)
"OPT_O_UAV_02_light_F", // Ababil unbewaffnet
"OPT_O_UAV_02_CAS_F", // Ababil GBU-12
"OPT_O_UAV_02_F", // Ababil Scalpel
"OPT_O_UAV_02_AA_F", // Ababil AA
"OPT_O_T_VTOL_02_infantry_unarmed_F", // VTOL Y-32 Xi'an (Inf-Transport)
"OPT_O_T_VTOL_02_vehicle_unarmed_F", // VTOL Y-32 Xi'an (Fahrzeug-Transport) 300000
"OPT_O_T_VTOL_02_infantry_F", // VTOL Y-32 Xi'an (Inf-Transport)
"OPT_O_T_VTOL_02_vehicle_F", // VTOL Y-32 Xi'an (Fahrzeug-Transport)
"OPT_O_T_VTOL_01_vehicle_F", // VTOL Blackfish (Fahrzeug-Transport)
"OPT4_O_Heli_Attack_02_F", // Mi-48 Kajman (Unbewaffnet) 200000
"OPT4_O_Heli_Attack_02_black_F", // Mi-48 Kajman (Schwarz)
"OPT_O_Plane_CAS_02_AA_F", // To-199 Neophron light - raus
"OPT_O_Plane_CAS_02_F", // To-199 Neophron
"OPT_O_Plane_Fighter_03_AA_F_1", // A-143 Buzzard (AA) 200000
"OPT_O_Plane_CAS_01_F_1" , // Wipeout CAS 400000
"OPT_O_T_UAV_04_CAS_F", // KH-3A Fenghuan - noch in arbeit erstma nur testweise mit preis eingebaut
"OPT_O_Plane_Fighter_AA_02_F" // To-201 Shikra (AA)
];


Expand All @@ -84,36 +94,34 @@ GVARMAIN(crew) = [
];

GVARMAIN(crew_vecs) = [
"OPT_B_APC_Wheeled_01_cannon_F", // AMV-7 Marshall,120000
"OPT_B_APC_Tracked_01_rcws_F", // IFV-6c Panther,45000
"OPT_B_APC_tracked_03_cannon_F", // FV-720 Mora,100000
"OPT_B_APC_Tracked_01_AA_F", // IFV-6a Cheetah,275000
"OPT_B_MBT_01_cannon_F", // M2A4 Slammer,340000
"OPT_B_MBT_01_TUSK_F", // M2A4 SlammerUp,430000
"OPT_B_MBT_03_cannon_F", // MBT-52 Kuma,500000 fliegt raus
"OPT_B_MBT_01_mlrs_F", // M5 Sandstorm,600000
"OPT_B_MBT_01_Arty_F", // M4 Scorcher,650000 <-- Psycho, Preis runter solange es die zustzliche Munition nicht gibt
"OPT_O_APC_Wheeled_03_cannon_F", // AFV-4 Gorgon,120000
"OPT_O_T_APC_Tracked_02_cannon_ghex_light_F", // BTR-K Kamysh,100000
"OPT_O_T_APC_Tracked_02_cannon_ghex_F", // BTR-K Kamysh (Titan),280000
"OPT_O_T_APC_Tracked_02_AA_ghex_F", // ZSU-39 Tigris,275000
"OPT_O_T_MBT_02_cannon_ghex_F", // T-100 Varsuk,450000
"OPT_O_T_MBT_02_arty_ghex_F", // 2S9 Sochor,650000 <-- Psycho, Preis runter solange es die zustzliche Munition nicht gibt
//vanilla
"OPT_O_APC_Tracked_02_cannon_light_F", // BTR-K Kamysh,100000
"OPT_O_APC_Tracked_02_cannon_F", // BTR-K Kamysh (Titan),280000
"OPT_O_APC_Tracked_02_AA_F", // ZSU-39 Tigris,275000
"OPT_O_MBT_02_cannon_F", // T-100 Varsuk,450000
"OPT_O_MBT_02_arty_F", // 2S9 Sochor,650000
"OPT_B_APC_Tracked_01_rcws_F_un",
"OPT_B_APC_Wheeled_01_cannon_F_un",
"OPT_B_APC_tracked_03_cannon_F_un",
"OPT_B_APC_Tracked_01_AA_F_un",
"OPT_B_MBT_01_TUSK_F_un",
"OPT_O_APC_Wheeled_02_rcws_F_un",
"OPT_O_APC_Wheeled_03_cannon_F_un",
"OPT_O_APC_Tracked_02_cannon_F_un",
"OPT_O_MBT_02_cannon_F_un"
"OPT4_B_APC_Tracked_01_rcws_F", // IFV-6c Panther
"OPT_B_APC_Wheeled_01_cannon_light_F", // AMV-7 Marshall (Leicht)
"OPT4_B_APC_Wheeled_01_cannon_F", // AMV-7 Marshall
"OPT4_B_APC_Tracked_01_AA_F", // IFV-6a Cheetah
"OPT4_B_APC_tracked_03_cannon_F", // FV-720 Mora
"OPT4_B_MBT_01_cannon_F", // M2A4 Slammer
"OPT4_B_MBT_01_TUSK_F", // M2A4 SlammerUp
"OPT_B_MBT_03_cannon_F", // MBT-52 Kuma, fliegt raus
"OPT_B_MBT_01_Arty_F", // M4 Scorcher
"OPT4_B_MBT_01_mlrs_F", // M4 Scorcher
"OPT4_B_MBT_01_arty_F", // M4 Scorcher
"OPT_B_MBT_01_mlrs_F", // M5 Sandstorm
"OPT4_O_APC_Wheeled_02_rcws_F", // MSE-3 Marid
"OPT_O_APC_Wheeled_03_cannon_light_F", // AFV-4 Gorgon (Leicht)
"OPT4_O_APC_Wheeled_03_cannon_F", // AFV-4 Gorgon
"OPT4_O_APC_Tracked_02_AA_F", // ZSU-39 Tigris
"OPT_O_APC_Tracked_02_cannon_light_F", // BTR-K Kamysh
"OPT4_O_APC_Tracked_02_cannon_F", // BTR-K Kamysh (Titan)
"OPT4_O_MBT_02_cannon_F", // T-100 Varsuk
"OPT4_O_MBT_02_arty_F", // 2S9 Sochor
"OPT4_O_T_APC_Wheeled_02_rcws_ghex_F", // MSE-3 Marid 50000
"OPT_O_APC_Wheeled_03_cannon_light_F", // AFV-4 Gorgon (Leicht) 90000
"OPT_O_APC_Wheeled_03_cannon_F", // AFV-4 Gorgon 120000
"OPT4_O_T_APC_Tracked_02_AA_ghex_F", // ZSU-39 Tigris 275000
"OPT_O_T_APC_Tracked_02_cannon_ghex_light_F", // BTR-K Kamysh 120000
"OPT4_O_T_APC_Tracked_02_cannon_ghex_F", // BTR-K Kamysh (Titan) 275000
"OPT4_O_T_MBT_02_cannon_ghex_F", // T-100 Varsuk 450000
"OPT4_O_T_MBT_02_arty_ghex_F" // 2S9 Sochor 400000
];

/* Waffenabfrage Offizier/Pilot/Crew*/
Expand Down Expand Up @@ -253,7 +261,11 @@ GVARMAIN(grenadiers) = [
"OPT_CSAT_Grenadier",
"OPT_NATO_Grenadier",
"OPT_NATO_Gruppenfuehrer",
"OPT_CSAT_Gruppenfuehrer"
"OPT_CSAT_Gruppenfuehrer",
"OPT_NATO_Aufklaerung_Truppfuehrer",
"OPT_NATO_Aufklaerung_Truppfuehrer_T",
"OPT_CSAT_Aufklaerung_Truppfuehrer",
"OPT_CSAT_Aufklaerung_Truppfuehrer_T"
];

GVARMAIN(grenadelaunchers) = [
Expand Down
2 changes: 1 addition & 1 deletion [J]OPT.lythium/main/script_version.hpp
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#define MAJOR 4
#define MINOR 14
#define BUILD 1
#define BUILD 2
Loading

0 comments on commit 6cabced

Please sign in to comment.