From 950c01d0c9b44ecb0e1b55d607b22863b29c2f1a Mon Sep 17 00:00:00 2001 From: He-Man Date: Mon, 5 Mar 2018 20:11:44 +0100 Subject: [PATCH] Missing Configs + Smal Admin Menu fixes --- Sources/epoch_config/Configs/CfgItemSort.hpp | 117 +++++++++++++++--- Sources/epoch_config/Configs/CfgPricing.hpp | 68 +++++++++- .../init/server_securityfunctions.sqf | 8 +- changelog.md | 8 ++ 4 files changed, 174 insertions(+), 27 deletions(-) diff --git a/Sources/epoch_config/Configs/CfgItemSort.hpp b/Sources/epoch_config/Configs/CfgItemSort.hpp index 60f3c617..3df89114 100644 --- a/Sources/epoch_config/Configs/CfgItemSort.hpp +++ b/Sources/epoch_config/Configs/CfgItemSort.hpp @@ -1132,28 +1132,84 @@ class CfgItemSort "ItemFireExtinguisher" }; Vehicles_Land[] = { - "ebike_epoch", // Motorrad + "ebike_epoch", // Motorcycle "C_Offroad_01_EPOCH", // Offroader + "C_Offroad_01_EPOCH1", + "C_Offroad_01_EPOCH2", + "C_Offroad_01_EPOCH3", + "C_Offroad_01_EPOCH4", "C_Quadbike_01_EPOCH", // Quad - "C_Hatchback_01_EPOCH", // Limousine - "C_Hatchback_02_EPOCH", // Sportlimousine + "C_Hatchback_01_EPOCH", // Hatchback + "C_Hatchback_01_EPOCH1", + "C_Hatchback_01_EPOCH2", + "C_Hatchback_01_EPOCH3", + "C_Hatchback_01_EPOCH4", + "C_Hatchback_02_EPOCH", // Hatchback Sport + "C_Hatchback_02_EPOCH1", + "C_Hatchback_02_EPOCH2", + "C_Hatchback_02_EPOCH3", + "C_Hatchback_02_EPOCH4", "C_SUV_01_EPOCH", // SUV - "C_Van_01_box_EPOCH", // Truck Boxer + "C_SUV_01_EPOCH1", + "C_SUV_01_EPOCH2", + "C_SUV_01_EPOCH3", + "C_SUV_01_EPOCH4", + "C_Van_01_box_EPOCH", // Truck Box + "C_Van_01_box_EPOCH1", + "C_Van_01_box_EPOCH2", + "C_Van_01_box_EPOCH3", + "C_Van_01_box_EPOCH4", "C_Van_01_transport_EPOCH", // Truck + "C_Van_01_transport_EPOCH1", + "C_Van_01_transport_EPOCH2", + "C_Van_01_transport_EPOCH3", + "C_Van_01_transport_EPOCH4", "K01", // Kart "K02", // Kart Blueking "K03", // Kart Redstone "K04", // Kart Vrana - "B_Truck_01_transport_EPOCH", // HEMTT Transport - Personen - "B_Truck_01_covered_EPOCH", // HEMTT Transporter abgedeckt - "B_Truck_01_mover_EPOCH", // HEMTT - "B_Truck_01_box_EPOCH", - "O_Truck_02_covered_EPOCH", - "O_Truck_02_transport_EPOCH", - "O_Truck_03_covered_EPOCH", - "O_Truck_03_transport_F", + "B_Truck_01_transport_EPOCH", // HEMTT Transport + "B_Truck_01_transport_EPOCH1", + "B_Truck_01_transport_EPOCH2", + "B_Truck_01_transport_EPOCH3", + "B_Truck_01_transport_EPOCH4", + "B_Truck_01_covered_EPOCH", // HEMTT Covered + "B_Truck_01_covered_EPOCH1", + "B_Truck_01_covered_EPOCH2", + "B_Truck_01_covered_EPOCH3", + "B_Truck_01_covered_EPOCH4", + "B_Truck_01_mover_EPOCH", // HEMTT Mover + "B_Truck_01_mover_EPOCH1", + "B_Truck_01_mover_EPOCH2", + "B_Truck_01_mover_EPOCH3", + "B_Truck_01_mover_EPOCH4", + "B_Truck_01_box_EPOCH", // HEMTT Box + "B_Truck_01_box_EPOCH1", + "B_Truck_01_box_EPOCH2", + "B_Truck_01_box_EPOCH3", + "B_Truck_01_box_EPOCH4", + "O_Truck_02_covered_EPOCH", // Zamak Covered + "O_Truck_02_covered_EPOCH1", + "O_Truck_02_covered_EPOCH2", + "O_Truck_02_covered_EPOCH3", + "O_Truck_02_covered_EPOCH4", + "O_Truck_02_transport_EPOCH", // Zamak Transport + "O_Truck_02_transport_EPOCH1", + "O_Truck_02_transport_EPOCH2", + "O_Truck_02_transport_EPOCH3", + "O_Truck_02_transport_EPOCH4", + "O_Truck_03_covered_EPOCH", // Tempest Covered + "O_Truck_03_covered_EPOCH1", + "O_Truck_03_covered_EPOCH2", + "O_Truck_03_covered_EPOCH3", + "O_Truck_03_covered_EPOCH4", + "O_Truck_03_transport_F", // Tempest Transport + "O_Truck_03_transport_F1", + "O_Truck_03_transport_F2", + "O_Truck_03_transport_F3", + "O_Truck_03_transport_F4", // Funktions Fahrzeuge |Repair,Heal,Tank| "C_Offroad_01_repair_F", @@ -1163,7 +1219,11 @@ class CfgItemSort "B_Truck_01_ammo_F", "B_Truck_01_fuel_F", "B_Truck_01_medical_F", - "O_Truck_02_box_EPOCH", + "O_Truck_02_box_EPOCH", // Zamak Box (Medical) + "O_Truck_02_box_EPOCH1", + "O_Truck_02_box_EPOCH2", + "O_Truck_02_box_EPOCH3", + "O_Truck_02_box_EPOCH4", "O_Truck_02_medical_F", "O_Truck_02_Ammo_F", "O_Truck_02_fuel_F", @@ -1175,10 +1235,28 @@ class CfgItemSort "O_G_Offroad_01_armed_F", "I_G_Offroad_01_armed_F", "B_G_Offroad_01_armed_F", + "B_G_Offroad_01_armed_EPOCH", + "B_G_Offroad_01_armed_EPOCH1", + "B_G_Offroad_01_armed_EPOCH2", + "B_G_Offroad_01_armed_EPOCH3", + "B_G_Offroad_01_armed_EPOCH4", "B_MRAP_01_EPOCH", + "B_MRAP_01_EPOCH1", + "B_MRAP_01_EPOCH2", + "B_MRAP_01_EPOCH3", + "B_MRAP_01_EPOCH4", "O_MRAP_02_F", + "O_MRAP_02_EPOCH", + "O_MRAP_02_EPOCH1", + "O_MRAP_02_EPOCH2", + "O_MRAP_02_EPOCH3", + "O_MRAP_02_EPOCH4", "I_MRAP_03_F", "I_MRAP_03_EPOCH", + "I_MRAP_03_EPOCH1", + "I_MRAP_03_EPOCH2", + "I_MRAP_03_EPOCH3", + "I_MRAP_03_EPOCH4", "B_MRAP_01_hmg_F", "O_MRAP_02_hmg_F", "I_MRAP_03_hmg_F", @@ -1240,6 +1318,9 @@ class CfgItemSort "C_Heli_light_01_furious_F", "C_Heli_light_01_wave_F", "C_Heli_light_01_sheriff_F", + "C_Heli_Light_01_civil_EPOCH", + "C_Heli_Light_01_civil_2seat_EPOCH", + "C_Heli_Light_01_civil_4seat_EPOCH", "O_Heli_Light_02_unarmed_EPOCH", "I_Heli_light_03_unarmed_EPOCH", @@ -1259,13 +1340,11 @@ class CfgItemSort "I_Heli_light_03_F", // Apex - "B_T_VTOL_01_vehicle_blue_F", - "B_T_VTOL_01_infantry_blue_F", - "B_T_VTOL_01_infantry_olive_F", + "B_T_VTOL_01_vehicle_blue_EPOCH", + "B_T_VTOL_01_infantry_olive_EPOCH", - "O_T_VTOL_02_vehicle_grey_F", - "O_T_VTOL_02_vehicle_F", - "O_T_VTOL_02_infantry_F" + "O_T_VTOL_02_infantry_EPOCH", + "O_T_VTOL_02_vehicle_grey_EPOCH" }; Vehicles_Ship[] = { diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index cbf500f3..4b19b87f 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -4403,10 +4403,18 @@ class CfgPricing { price = 1000; }; + class C_Van_01_box_EPOCH1: C_Van_01_box_EPOCH{}; + class C_Van_01_box_EPOCH2: C_Van_01_box_EPOCH{}; + class C_Van_01_box_EPOCH3: C_Van_01_box_EPOCH{}; + class C_Van_01_box_EPOCH4: C_Van_01_box_EPOCH{}; class C_Van_01_transport_EPOCH { price = 1000; }; + class C_Van_01_transport_EPOCH1: C_Van_01_transport_EPOCH{}; + class C_Van_01_transport_EPOCH2: C_Van_01_transport_EPOCH{}; + class C_Van_01_transport_EPOCH3: C_Van_01_transport_EPOCH{}; + class C_Van_01_transport_EPOCH4: C_Van_01_transport_EPOCH{}; class C_Boat_Civil_01_EPOCH { price = 750; @@ -4431,10 +4439,26 @@ class CfgPricing { price = 2500; }; + class B_MRAP_01_EPOCH1: B_MRAP_01_EPOCH{}; + class B_MRAP_01_EPOCH2: B_MRAP_01_EPOCH{}; + class B_MRAP_01_EPOCH3: B_MRAP_01_EPOCH{}; + class B_MRAP_01_EPOCH4: B_MRAP_01_EPOCH{}; + class O_MRAP_02_EPOCH + { + price = 2500; + }; + class O_MRAP_02_EPOCH1: O_MRAP_02_EPOCH{}; + class O_MRAP_02_EPOCH2: O_MRAP_02_EPOCH{}; + class O_MRAP_02_EPOCH3: O_MRAP_02_EPOCH{}; + class O_MRAP_02_EPOCH4: O_MRAP_02_EPOCH{}; class I_MRAP_03_EPOCH { price = 2500; }; + class I_MRAP_03_EPOCH1: I_MRAP_03_EPOCH{}; + class I_MRAP_03_EPOCH2: I_MRAP_03_EPOCH{}; + class I_MRAP_03_EPOCH3: I_MRAP_03_EPOCH{}; + class I_MRAP_03_EPOCH4: I_MRAP_03_EPOCH{}; class B_G_Offroad_01_armed_EPOCH { price = 2500; @@ -4447,34 +4471,66 @@ class CfgPricing { price = 1000; }; + class B_Truck_01_transport_EPOCH1: B_Truck_01_transport_EPOCH {}; + class B_Truck_01_transport_EPOCH2: B_Truck_01_transport_EPOCH {}; + class B_Truck_01_transport_EPOCH3: B_Truck_01_transport_EPOCH {}; + class B_Truck_01_transport_EPOCH4: B_Truck_01_transport_EPOCH {}; class B_Truck_01_covered_EPOCH { price = 1000; }; + class B_Truck_01_covered_EPOCH1: B_Truck_01_covered_EPOCH {}; + class B_Truck_01_covered_EPOCH2: B_Truck_01_covered_EPOCH {}; + class B_Truck_01_covered_EPOCH3: B_Truck_01_covered_EPOCH {}; + class B_Truck_01_covered_EPOCH4: B_Truck_01_covered_EPOCH {}; class B_Truck_01_mover_EPOCH { price = 1000; }; + class B_Truck_01_mover_EPOCH1: B_Truck_01_mover_EPOCH {}; + class B_Truck_01_mover_EPOCH2: B_Truck_01_mover_EPOCH {}; + class B_Truck_01_mover_EPOCH3: B_Truck_01_mover_EPOCH {}; + class B_Truck_01_mover_EPOCH4: B_Truck_01_mover_EPOCH {}; class B_Truck_01_box_EPOCH { price = 1000; }; + class B_Truck_01_box_EPOCH1: B_Truck_01_box_EPOCH {}; + class B_Truck_01_box_EPOCH2: B_Truck_01_box_EPOCH {}; + class B_Truck_01_box_EPOCH3: B_Truck_01_box_EPOCH {}; + class B_Truck_01_box_EPOCH4: B_Truck_01_box_EPOCH {}; class O_Truck_02_covered_EPOCH { price = 1000; }; + class O_Truck_02_covered_EPOCH1: O_Truck_02_covered_EPOCH {}; + class O_Truck_02_covered_EPOCH2: O_Truck_02_covered_EPOCH {}; + class O_Truck_02_covered_EPOCH3: O_Truck_02_covered_EPOCH {}; + class O_Truck_02_covered_EPOCH4: O_Truck_02_covered_EPOCH {}; class O_Truck_02_transport_EPOCH { price = 1000; }; + class O_Truck_02_transport_EPOCH1: O_Truck_02_transport_EPOCH {}; + class O_Truck_02_transport_EPOCH2: O_Truck_02_transport_EPOCH {}; + class O_Truck_02_transport_EPOCH3: O_Truck_02_transport_EPOCH {}; + class O_Truck_02_transport_EPOCH4: O_Truck_02_transport_EPOCH {}; class O_Truck_03_covered_EPOCH { price = 1000; }; + class O_Truck_03_covered_EPOCH1: O_Truck_03_covered_EPOCH {}; + class O_Truck_03_covered_EPOCH2: O_Truck_03_covered_EPOCH {}; + class O_Truck_03_covered_EPOCH3: O_Truck_03_covered_EPOCH {}; + class O_Truck_03_covered_EPOCH4: O_Truck_03_covered_EPOCH {}; class O_Truck_02_box_EPOCH { price = 1000; }; + class O_Truck_02_box_EPOCH1: O_Truck_02_box_EPOCH {}; + class O_Truck_02_box_EPOCH2: O_Truck_02_box_EPOCH {}; + class O_Truck_02_box_EPOCH3: O_Truck_02_box_EPOCH {}; + class O_Truck_02_box_EPOCH4: O_Truck_02_box_EPOCH {}; class O_Heli_Light_02_unarmed_EPOCH { price = 2500; @@ -4491,6 +4547,8 @@ class CfgPricing { price = 2500; }; + class C_Heli_Light_01_civil_2seat_EPOCH: C_Heli_Light_01_civil_EPOCH {}; + class C_Heli_Light_01_civil_4seat_EPOCH: C_Heli_Light_01_civil_EPOCH {}; class O_Heli_Transport_04_EPOCH { price = 2500; @@ -4779,14 +4837,16 @@ class CfgPricing { price = 4400; }; - class B_T_VTOL_01_infantry_F + class B_T_VTOL_01_vehicle_blue_EPOCH { price = 10000; }; - class B_T_VTOL_01_vehicle_F - { + class B_T_VTOL_01_infantry_olive_EPOCH: B_T_VTOL_01_vehicle_blue_EPOCH {}; + class O_T_VTOL_02_infantry_EPOCH + { price = 10000; - }; + }; + class O_T_VTOL_02_vehicle_grey_EPOCH: O_T_VTOL_02_infantry_EPOCH {}; class B_UavTerminal { price = 10; diff --git a/Sources/epoch_server/init/server_securityfunctions.sqf b/Sources/epoch_server/init/server_securityfunctions.sqf index 9f5e02da..ecab4ccc 100644 --- a/Sources/epoch_server/init/server_securityfunctions.sqf +++ b/Sources/epoch_server/init/server_securityfunctions.sqf @@ -501,7 +501,7 @@ for "_i" from 1 to 3 do { _temp = _temp + " ,['Key Binds',[],'','1',[]] - ,[' 3 Key - Teleport In Front',[],'','1',[]] + ,[' 5 Key - Teleport In Front',[],'','1',[]] ,[' F2 - Cancel Spectating',[],'','1',[]] ,[' F5 - Delete Target',[],'','1',[]] ]; @@ -1815,10 +1815,10 @@ _skn_admincode = compileFinal (" _cfgPricing = 'CfgPricing' call EPOCH_returnConfig; if (_this == 61) then { _airVehicles = "" + (configName _x) iskindof 'AIR' && getText(_x >> 'displayName') != '' && getText(_x >> 'picture') != '' && getNumber(_x >> 'type') != 0 && - getText (_x >> 'vehicleClass') in ['Air'] && isClass(_cfgPricing >> configName _x) ""configClasses (configFile >> 'CfgVehicles'); { @@ -1829,10 +1829,10 @@ _skn_admincode = compileFinal (" }; if (_this == 62) then { _landVehicles = "" + (configName _x) iskindof 'LandVehicle' && getText(_x >> 'displayName') != '' && getText(_x >> 'picture') != '' && configName _x != 'PaperCar' && - getText (_x >> 'vehicleClass') in ['Car'] && isClass(_cfgPricing >> configName _x) ""configClasses (configFile >> 'CfgVehicles'); { @@ -1843,10 +1843,10 @@ _skn_admincode = compileFinal (" }; if (_this == 63) then { _shipVehicles = "" + (configName _x) iskindof 'SHIP' && getText(_x >> 'displayName') != '' && getText(_x >> 'picture') != '' && getNumber(_x >> 'type') in [1,2,3,4] && - getText (_x >> 'vehicleClass') in ['Ship'] && isClass(_cfgPricing >> configName _x) ""configClasses (configFile >> 'CfgVehicles'); { diff --git a/changelog.md b/changelog.md index cad77981..64cdece8 100644 --- a/changelog.md +++ b/changelog.md @@ -41,6 +41,7 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - Some Tarp Loot was spawned under the Floor @He-Man - Reworked wall check by getting out of Vehicles @He-Man - Garden Plot had no physical ground @Helion4 +- Some Vehicles were missing in EPOCH Admin Spawn Menu @He-Man ### Changed - RCon Port is now set to 2307 by default since changes in A3 1.78 prevent use of 2306. @AWOL - SnapPoints for Building objects (especially full / half / quarter Floors) @He-Man @@ -55,6 +56,13 @@ All changes for [Arma 3](https://arma3.com/) [Epoch Mod](https://epochmod.com) a - You also get a Tooltip, how much bullets left in magazine - The prices are calculated by the left bullets in the magazine - Increased snap-distance for Foundations (much easier to find snap positions) @He-Man +- Reworked and added EPOCH Vehicle Classes @He-Man + - Each upgrade increase Speed, Torque, Fuel, Terrainbehaviour, Load and Armor + - Hatchback >= lvl2 will no longer stuck in forests + - Added M900 forced without Backseats -> "C_Heli_Light_01_civil_2seat_EPOCH" + - Added M900 forced with Backseats -> "C_Heli_Light_01_civil_4seat_EPOCH" + - The Random M900 will also stay available -> "C_Heli_Light_01_civil_EPOCH" + - Added very low EPOCH variants of VTOL and Xi'an (eventually we have to change them with the next update a bit) ## [1.0.0.1077] - 2017-11-05 ### Added