From ad9a287d00f4b40b488c254d10770c776ee757f2 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 18 Nov 2016 12:18:13 -0500 Subject: [PATCH] Remove unused Lada base class Also removed some values that are already inhertied from 8429ad1 --- .../Configs/CfgVehicles/Bikes/TT650_Civ.hpp | 5 + .../Configs/CfgVehicles/Boat/RHIB.hpp | 4 - .../Configs/CfgVehicles/Boat/smallboat.hpp | 1 + .../Configs/CfgVehicles/Car/Lada.hpp | 185 ------------------ .../Configs/CfgVehicles/Car/S1203.hpp | 7 +- 5 files changed, 7 insertions(+), 195 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp b/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp index 7a80daffb..fa7f6e4b5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Bikes/TT650_Civ.hpp @@ -65,6 +65,11 @@ class TT650_Civ: TT650_Base { }; class TT650_TK_CIV_EP1: TT650_Base { + faction = "CIV"; + rarityurban = 0.8; + scope = public; + side = 3; + maxspeed = 180; crew = ""; typicalCargo[] = {}; class TransportMagazines {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp index 3c9cb7a1f..1a18c0536 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/RHIB.hpp @@ -271,10 +271,6 @@ class RHIB: Boat class RHIB2Turret: RHIB { displayName = "RHIB (Mk19)"; - crew = ""; - typicalCargo[] = {}; - class TransportMagazines {}; - class TransportWeapons {}; }; class RHIB_DZ : Boat diff --git a/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp b/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp index c18357d4b..8aeb6d86d 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Boat/smallboat.hpp @@ -24,6 +24,7 @@ class Smallboat_1: Ship transportMaxMagazines = 200; transportMaxWeapons = 20; transportMaxBackpacks = 4; + maxSpeed = 29; transportSoldier = 5; cost = 10000; armor = 10; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp index aed2e1410..30cdea9e8 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/Lada.hpp @@ -182,191 +182,6 @@ class Lada_base: Car { rarityUrban = 0.5; }; -class Lada_base_alt: Car { - wheelCircumference = 1.866; - scope = protected; - picture = "\Ca\wheeled2\data\UI\Picture_lada_ca.paa"; - displayname = "UAZ"; - class Library { - libTextDesc = "The Lada Riva 1500 is a medium-size Russian-made family car."; - }; - side = 3; - faction = "CIV"; - vehicleClass = "Car"; - crew = ""; - typicalCargo[] = {}; - maxSpeed = 120; - terrainCoef = 6; - turnCoef = 2; - steerAheadPlan = 0.15; - transportSoldier = 3; - weapons[] = {"CarHorn"}; - magazines[] = {}; - class Turrets { - }; - armor = 20; - damageResistance = 0.01511; - cost = 3000; - fuelCapacity = 50; - memoryPointsGetInCargo[] = {"pos cargo 1","pos cargo 2","pos cargo 3","pos cargo 4"}; - memoryPointsGetInCargoDir[] = {"pos cargo dir 1","pos cargo dir 2","pos cargo dir 3","pos cargo dir 4"}; - DriverAction = "Golf_Driver"; - cargoAction[] = {"Golf_Cargo01","Golf_Cargo02","Golf_Cargo02"}; - cargoIsCoDriver[] = {0}; - soundGear[] = {"",5.62341e-005,1}; - SoundGetIn[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_door",1,1}; - SoundGetOut[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_door",1,1,30}; - soundEngineOnInt[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_start",1,1}; - soundEngineOnExt[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_start",1,1,100}; - soundEngineOffInt[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_stop",1,1}; - soundEngineOffExt[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_stop",1,1,100}; - buildCrash0[] = {"Ca\sounds\Vehicles\Crash\tank_building_01",0.707946,1,150}; - buildCrash1[] = {"Ca\sounds\Vehicles\Crash\tank_building_02",0.707946,1,150}; - buildCrash2[] = {"Ca\sounds\Vehicles\Crash\tank_building_03",0.707946,1,150}; - buildCrash3[] = {"Ca\sounds\Vehicles\Crash\tank_building_04",0.707946,1,150}; - soundBuildingCrash[] = {"buildCrash0",0.25,"buildCrash1",0.25,"buildCrash2",0.25,"buildCrash3",0.25}; - WoodCrash0[] = {"Ca\sounds\Vehicles\Crash\tank_wood_01",0.707946,1,150}; - WoodCrash1[] = {"Ca\sounds\Vehicles\Crash\tank_wood_02",0.707946,1,150}; - WoodCrash2[] = {"Ca\sounds\Vehicles\Crash\tank_wood_03",0.707946,1,150}; - WoodCrash3[] = {"Ca\sounds\Vehicles\Crash\tank_wood_04",0.707946,1,150}; - WoodCrash4[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_05",0.707946,1,200}; - WoodCrash5[] = {"Ca\sounds\Vehicles\Crash\crash_mix_wood_06",0.707946,1,200}; - soundWoodCrash[] = {"woodCrash0",0.25,"woodCrash1",0.25,"woodCrash2",0.25,"woodCrash3",0.25}; - ArmorCrash0[] = {"Ca\sounds\Vehicles\Crash\tank_vehicle_01",0.707946,1,150}; - ArmorCrash1[] = {"Ca\sounds\Vehicles\Crash\tank_vehicle_02",0.707946,1,150}; - ArmorCrash2[] = {"Ca\sounds\Vehicles\Crash\tank_vehicle_03",0.707946,1,150}; - ArmorCrash3[] = {"Ca\sounds\Vehicles\Crash\tank_vehicle_04",0.707946,1,150}; - soundArmorCrash[] = {"ArmorCrash0",0.25,"ArmorCrash1",0.25,"ArmorCrash2",0.25,"ArmorCrash3",0.25}; - class SoundEvents { - class AccelerationIn { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_acceleration",0.562341,1}; - limit = "0.15"; - expression = "engineOn*(1-camPos)*2*gmeterZ*((speed factor[1.5, 5]) min (speed factor[5, 1.5]))"; - }; - class AccelerationOut { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_acceleration",0.562341,1,300}; - limit = "0.15"; - expression = "engineOn*camPos*2*gmeterZ*((speed factor[1.5, 5]) min (speed factor[5, 1.5]))"; - }; - }; - class Sounds { - class Engine { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_low",1.41254,0.6,200}; - frequency = "(randomizer*0.05+0.95)*rpm"; - volume = "camPos*engineOn*((rpm factor[0.3, 0.4]) min (rpm factor[0.7, 0.5]))"; - }; - class EngineHighOut { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_mid",1.41254,0.6,300}; - frequency = "(randomizer*0.05+0.95)*rpm"; - volume = "camPos*engineOn*(rpm factor[0.5, 0.8])"; - }; - class IdleOut { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_ext_idle",0.562341,1,100}; - frequency = "1"; - volume = "engineOn*camPos*(rpm factor[0.4, 0])"; - }; - class TiresRockOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-rock2",0.1,1,50}; - frequency = "1"; - volume = "camPos*rock*(speed factor[2, 20])"; - }; - class TiresSandOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-sand2",0.1,1,50}; - frequency = "1"; - volume = "camPos*sand*(speed factor[2, 20])"; - }; - class TiresGrassOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-grass3",0.1,1,50}; - frequency = "1"; - volume = "camPos*grass*(speed factor[2, 20])"; - }; - class TiresMudOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-mud2",0.1,1,50}; - frequency = "1"; - volume = "camPos*mud*(speed factor[2, 20])"; - }; - class TiresGravelOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-gravel2",0.1,1,50}; - frequency = "1"; - volume = "camPos*gravel*(speed factor[2, 20])"; - }; - class TiresAsphaltOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\ext\ext-tires-asphalt3",0.1,1,50}; - frequency = "1"; - volume = "camPos*asphalt*(speed factor[2, 20])"; - }; - class NoiseOut { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Noises\ext\noise3",0.562341,1,50}; - frequency = "1"; - volume = "camPos*(damper0 max 0.04)*(speed factor[0, 8])"; - }; - class EngineLowIn { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_low",1.41254,0.6}; - frequency = "(randomizer*0.05+0.95)*rpm"; - volume = "(1-camPos)*engineOn*((rpm factor[0.3, 0.4]) min (rpm factor[0.7, 0.5]))"; - }; - class EngineHighIn { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_mid",1.41254,0.6}; - frequency = "(randomizer*0.05+0.95)*rpm"; - volume = "(1-camPos)*engineOn*(rpm factor[0.5, 0.8])"; - }; - class IdleIn { - sound[] = {"\ca\Sounds_E\Wheeled_E\lada\lada_int_idle",0.794328,1}; - frequency = "1"; - volume = "engineOn*(rpm factor[0.4, 0])*(1-camPos)"; - }; - class TiresRockIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-rock2",0.1,1}; - frequency = "1"; - volume = "(1-camPos)*rock*(speed factor[2, 20])"; - }; - class TiresSandIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-sand2",0.1,1}; - frequency = "1"; - volume = "(1-camPos)*sand*(speed factor[2, 20])"; - }; - class TiresGrassIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-grass3",0.1,1}; - frequency = "1"; - volume = "(1-camPos)*grass*(speed factor[2, 20])"; - }; - class TiresMudIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-mud2",0.1,1}; - frequency = "1"; - volume = "(1-camPos)*mud*(speed factor[2, 20])"; - }; - class TiresGravelIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-gravel2",0.1,1}; - frequency = "1"; - volume = "(1-camPos)*gravel*(speed factor[2, 20])"; - }; - class TiresAsphaltIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Tires\int\int-tires-asphalt3",0.1,1}; - frequency = "1"; - volume = "(1-camPos)*asphalt*(speed factor[2, 20])"; - }; - class NoiseIn { - sound[] = {"\ca\SOUNDS\Vehicles\Wheeled\Noises\int\noise4",0.316228,1}; - frequency = "1"; - volume = "(damper0 max 0.04)*(speed factor[0, 8])*(1-camPos)"; - }; - class Movement { - sound = "soundEnviron"; - frequency = "1"; - volume = "0"; - }; - }; - class Damage { - tex[] = {}; - mat[] = {"Ca\wheeled_E\Lada\Data\Lada_chrome.rvmat","Ca\wheeled_E\Lada\Data\Lada_chrome.rvmat","Ca\wheeled_E\Lada\Data\Lada_chrome_destruct.rvmat","Ca\wheeled_E\Lada\Data\Lada_glass.rvmat","Ca\wheeled_E\Lada\Data\Lada_glass_damage.rvmat","Ca\wheeled_E\Lada\Data\Lada_glass_damage.rvmat","Ca\wheeled_E\Lada\Data\Lada_glass_in.rvmat","Ca\wheeled_E\Lada\Data\Lada_glass_in_damage.rvmat","Ca\wheeled_E\Lada\Data\Lada_glass_in_damage.rvmat","Ca\wheeled_E\Lada\Data\Lada_mat.rvmat","Ca\wheeled_E\Lada\Data\Lada_mat_damage.rvmat","Ca\wheeled_E\Lada\Data\Lada_mat_destruct.rvmat","Ca\Ca_E\data\default.rvmat","Ca\Ca_E\data\default.rvmat","Ca\Ca_E\data\default_destruct.rvmat"}; - }; - rarityUrban = 0.5; - model = "ca\wheeled_E\Lada\Lada"; - brakeDistance = 10; - outisideSoundFilter = 1; - insideSoundCoef = 0.9; -}; - class Lada1: Lada_base { scope = public; displayname = "UAZ (White)"; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp b/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp index ac18ed215..94c05b26b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Car/S1203.hpp @@ -5,9 +5,4 @@ class S1203_TK_CIV_EP1: Car { class TransportWeapons {}; }; -class S1203_ambulance_EP1: S1203_TK_CIV_EP1 { - crew = ""; - typicalCargo[] = {}; - class TransportMagazines {}; - class TransportWeapons {}; -}; \ No newline at end of file +class S1203_ambulance_EP1: S1203_TK_CIV_EP1 {}; \ No newline at end of file