diff --git a/.hemtt/missions/test.Stratis/mission.sqm b/.hemtt/missions/test.Stratis/mission.sqm index f5f7e84..562c927 100644 Binary files a/.hemtt/missions/test.Stratis/mission.sqm and b/.hemtt/missions/test.Stratis/mission.sqm differ diff --git a/addons/m119/tbd_m119/CfgAnimationSourceSounds.hpp b/addons/m119/tbd_m119/CfgAnimationSourceSounds.hpp index 21015b5..7ebf464 100644 --- a/addons/m119/tbd_m119/CfgAnimationSourceSounds.hpp +++ b/addons/m119/tbd_m119/CfgAnimationSourceSounds.hpp @@ -22,4 +22,39 @@ class CfgAnimationSourceSounds { trigger = "direction"; }; }; + + class close { + + class close_1 { + loop = 0; + terminate = 0; + sound0[] = {QPATHTOF(TBD_M119\sounds\close.ogg), 3, 1, 20}; + sound1[] = {QPATHTOF(TBD_M119\sounds\close.ogg), 3, 1, 20}; + sound[] = {"sound0", 1}; + trigger = "direction * (phase factor [0.01,0.02])"; +}; +class close_2 { + loop = 0; + terminate = 0; + sound0[] = {QPATHTOF(TBD_M119\sounds\close.ogg), 3, 1, 20}; + sound1[] = {QPATHTOF(TBD_M119\sounds\close.ogg), 3, 1, 20}; + sound[] = {"sound0", 1}; + trigger = "(1 - direction) * (phase factor [0.1,0.09])"; +}; + + }; + class reload { + + class reload_1 { + loop = 0; + terminate = 1; + sound0[] = {QPATHTOF(TBD_M119\sounds\reload.ogg), 5, 1, 20}; + sound1[] = {QPATHTOF(TBD_M119\sounds\reload.ogg), 5, 1, 20}; + sound[] = {"sound0", 1}; + trigger = "direction"; +}; + }; + + + }; \ No newline at end of file diff --git a/addons/m119/tbd_m119/CfgVehicles.hpp b/addons/m119/tbd_m119/CfgVehicles.hpp index 489fd55..f8e163b 100644 --- a/addons/m119/tbd_m119/CfgVehicles.hpp +++ b/addons/m119/tbd_m119/CfgVehicles.hpp @@ -128,6 +128,11 @@ class CfgVehicles { initPhase = 0; animPeriod = 1; }; + class trigger_source { + source = "user"; + initPhase = 0; + animPeriod = 1; + }; class recoil_rest_source { source = "user"; initPhase = 0; @@ -138,15 +143,29 @@ class CfgVehicles { initPhase = 0; animPeriod = 1; }; + class open_breach_source { source = "user"; initPhase = 0; animPeriod = 1; + sound = "close"; + soundPosition = "konec_hlavne"; }; + + class close_breach_source { + source = "user"; + initPhase = 1; + animPeriod = 1; + sound = "close"; + soundPosition = "konec_hlavne"; + }; + + class handle_breach_source { source = "user"; initPhase = 0; animPeriod = 1; + }; class hydraulics_source { source = "user"; @@ -163,6 +182,9 @@ class CfgVehicles { source = "user"; initPhase = 0; animPeriod = 0.5; + sound = "reload"; + soundPosition = "konec_hlavne"; + }; class magazine_hide_source { diff --git a/addons/m119/tbd_m119/CfgWeapons.hpp b/addons/m119/tbd_m119/CfgWeapons.hpp index cfcfa32..07db915 100644 --- a/addons/m119/tbd_m119/CfgWeapons.hpp +++ b/addons/m119/tbd_m119/CfgWeapons.hpp @@ -30,7 +30,7 @@ class CfgWeapons { {QPATHTOF(TBD_M119\sounds\reload.ogg), 3, 1, 50}; reloadTime=0.35; artilleryDispersion=1.9; - artilleryCharge = 1; + artilleryCharge = 0.14; aiRateOfFire=1; aiRateOfFireDistance=10; minRange=0; @@ -40,5 +40,34 @@ class CfgWeapons { maxRange=2; maxRangeProbab=0.0099999998; }; + class Single2: Single1 { + displayName="105mm howitzer charge 2"; + artilleryCharge = 0.28; + }; + + class Single3: Single1 { + displayName="105mm howitzer charge 3"; + artilleryCharge = 0.42; + }; + + class Single4: Single1 { + displayName="105mm howitzer charge 4"; + artilleryCharge = 0.56; + }; + + class Single5: Single1 { + displayName="105mm howitzer charge 5"; + artilleryCharge = 0.70; + }; + + class Single6: Single1 { + displayName="105mm howitzer charge 6"; + artilleryCharge = 0.84; + }; + + class Single7: Single1 { + displayName="105mm howitzer charge 7"; + artilleryCharge = 1; + }; }; }; diff --git a/addons/m119/tbd_m119/TBD_M119.p3d b/addons/m119/tbd_m119/TBD_M119.p3d index cf31f79..3104159 100644 Binary files a/addons/m119/tbd_m119/TBD_M119.p3d and b/addons/m119/tbd_m119/TBD_M119.p3d differ diff --git a/addons/m119/tbd_m119/data/Five_co.paa b/addons/m119/tbd_m119/data/Five_co.paa index 85b948e..1102c91 100644 Binary files a/addons/m119/tbd_m119/data/Five_co.paa and b/addons/m119/tbd_m119/data/Five_co.paa differ diff --git a/addons/m119/tbd_m119/data/Five_nohq.paa b/addons/m119/tbd_m119/data/Five_nohq.paa index 568899e..a9426a9 100644 Binary files a/addons/m119/tbd_m119/data/Five_nohq.paa and b/addons/m119/tbd_m119/data/Five_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/Five_smdi.paa b/addons/m119/tbd_m119/data/Five_smdi.paa index 01be8d6..768a8fc 100644 Binary files a/addons/m119/tbd_m119/data/Five_smdi.paa and b/addons/m119/tbd_m119/data/Five_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/Four_co.paa b/addons/m119/tbd_m119/data/Four_co.paa index ac786ea..aecc6bf 100644 Binary files a/addons/m119/tbd_m119/data/Four_co.paa and b/addons/m119/tbd_m119/data/Four_co.paa differ diff --git a/addons/m119/tbd_m119/data/Four_nohq.paa b/addons/m119/tbd_m119/data/Four_nohq.paa index 947d996..ccd1635 100644 Binary files a/addons/m119/tbd_m119/data/Four_nohq.paa and b/addons/m119/tbd_m119/data/Four_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/Four_smdi.paa b/addons/m119/tbd_m119/data/Four_smdi.paa index 32b835b..80a0596 100644 Binary files a/addons/m119/tbd_m119/data/Four_smdi.paa and b/addons/m119/tbd_m119/data/Four_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/One_co.paa b/addons/m119/tbd_m119/data/One_co.paa index b0a66eb..1d30c53 100644 Binary files a/addons/m119/tbd_m119/data/One_co.paa and b/addons/m119/tbd_m119/data/One_co.paa differ diff --git a/addons/m119/tbd_m119/data/One_nohq.paa b/addons/m119/tbd_m119/data/One_nohq.paa index 980d727..2d53901 100644 Binary files a/addons/m119/tbd_m119/data/One_nohq.paa and b/addons/m119/tbd_m119/data/One_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/One_smdi.paa b/addons/m119/tbd_m119/data/One_smdi.paa index 48fbdbb..bd7afab 100644 Binary files a/addons/m119/tbd_m119/data/One_smdi.paa and b/addons/m119/tbd_m119/data/One_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/Seven_co.paa b/addons/m119/tbd_m119/data/Seven_co.paa index a8b60fc..2ac935a 100644 Binary files a/addons/m119/tbd_m119/data/Seven_co.paa and b/addons/m119/tbd_m119/data/Seven_co.paa differ diff --git a/addons/m119/tbd_m119/data/Seven_nohq.paa b/addons/m119/tbd_m119/data/Seven_nohq.paa index a0a7d72..eb60331 100644 Binary files a/addons/m119/tbd_m119/data/Seven_nohq.paa and b/addons/m119/tbd_m119/data/Seven_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/Seven_smdi.paa b/addons/m119/tbd_m119/data/Seven_smdi.paa index 04c9084..b5527cf 100644 Binary files a/addons/m119/tbd_m119/data/Seven_smdi.paa and b/addons/m119/tbd_m119/data/Seven_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/Six_co.paa b/addons/m119/tbd_m119/data/Six_co.paa index 27d839d..c91ff8b 100644 Binary files a/addons/m119/tbd_m119/data/Six_co.paa and b/addons/m119/tbd_m119/data/Six_co.paa differ diff --git a/addons/m119/tbd_m119/data/Six_nohq.paa b/addons/m119/tbd_m119/data/Six_nohq.paa index 6b0cdb1..f1f6c68 100644 Binary files a/addons/m119/tbd_m119/data/Six_nohq.paa and b/addons/m119/tbd_m119/data/Six_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/Six_smdi.paa b/addons/m119/tbd_m119/data/Six_smdi.paa index 9cafe17..8ed3e04 100644 Binary files a/addons/m119/tbd_m119/data/Six_smdi.paa and b/addons/m119/tbd_m119/data/Six_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/Three_co.paa b/addons/m119/tbd_m119/data/Three_co.paa index 4cb42a4..ce0cc33 100644 Binary files a/addons/m119/tbd_m119/data/Three_co.paa and b/addons/m119/tbd_m119/data/Three_co.paa differ diff --git a/addons/m119/tbd_m119/data/Three_nohq.paa b/addons/m119/tbd_m119/data/Three_nohq.paa index 14161e0..1ab0747 100644 Binary files a/addons/m119/tbd_m119/data/Three_nohq.paa and b/addons/m119/tbd_m119/data/Three_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/Three_smdi.paa b/addons/m119/tbd_m119/data/Three_smdi.paa index 5cc9d9a..057ba8b 100644 Binary files a/addons/m119/tbd_m119/data/Three_smdi.paa and b/addons/m119/tbd_m119/data/Three_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/Two_co.paa b/addons/m119/tbd_m119/data/Two_co.paa index 9107d7e..ca895c5 100644 Binary files a/addons/m119/tbd_m119/data/Two_co.paa and b/addons/m119/tbd_m119/data/Two_co.paa differ diff --git a/addons/m119/tbd_m119/data/Two_nohq.paa b/addons/m119/tbd_m119/data/Two_nohq.paa index 97cb0bd..0688ec5 100644 Binary files a/addons/m119/tbd_m119/data/Two_nohq.paa and b/addons/m119/tbd_m119/data/Two_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/Two_smdi.paa b/addons/m119/tbd_m119/data/Two_smdi.paa index 138a342..7b8e7b1 100644 Binary files a/addons/m119/tbd_m119/data/Two_smdi.paa and b/addons/m119/tbd_m119/data/Two_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/five.rvmat b/addons/m119/tbd_m119/data/five.rvmat index 96c2c37..5fcfa97 100644 --- a/addons/m119/tbd_m119/data/five.rvmat +++ b/addons/m119/tbd_m119/data/five.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 100; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/data/four.rvmat b/addons/m119/tbd_m119/data/four.rvmat index bd5b801..027c960 100644 --- a/addons/m119/tbd_m119/data/four.rvmat +++ b/addons/m119/tbd_m119/data/four.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 100; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/data/one.rvmat b/addons/m119/tbd_m119/data/one.rvmat index 4e5e78c..a749acb 100644 --- a/addons/m119/tbd_m119/data/one.rvmat +++ b/addons/m119/tbd_m119/data/one.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 50; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/data/scope.rvmat b/addons/m119/tbd_m119/data/scope.rvmat new file mode 100644 index 0000000..f3b9830 --- /dev/null +++ b/addons/m119/tbd_m119/data/scope.rvmat @@ -0,0 +1,104 @@ +//////////////////////////////////////////////////////////////////// +//DeRap: Produced from mikero's Dos Tools Dll version 5.52 +//'now' is Fri Feb 09 09:45:35 2018 : 'file' last modified on Fri Feb 09 09:45:35 2018 +//http://dev-heaven.net/projects/list_files/mikero-pbodll +//////////////////////////////////////////////////////////////////// + +#define _ARMA_ + +//Class armor_f_gamma : MBT_01\Data\MBT_01_body.rvmat{ +ambient[] = { 0.5, 0.5, 0.5, 0.5 }; +diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; +forcedDiffuse[] = { 0, 0, 0, 1 }; +emmisive[] = { 0, 0, 0, 1 }; +specular[] = { 0.5, 0.5, 0.5, 0.5 }; +specularPower = 30; +PixelShaderID = "Super"; +VertexShaderID = "Super"; + + + +class Stage1 +{ + texture="x\TBD_M119\addons\M119\tbd_m119\data\scope_nohq.paa"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1,0,0}; + up[] = {0,1,0}; + dir[] = {0,0,0}; + pos[] = {0,0,0}; + }; +}; +class Stage2 +{ + texture = "#(argb,8,8,3)color(0.5,0.5,0.5,0.5,DT)"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1,0,0}; + up[] = {0,1,0}; + dir[] = {0,0,0}; + pos[] = {0,0,0}; + }; +}; +class Stage3 +{ + texture = "#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1,0,0}; + up[] = {0,1,0}; + dir[] = {0,0,0}; + pos[] = {0,0,0}; + }; +}; +class Stage4 +{ + texture="x\TBD_M119\addons\M119\tbd_m119\data\scope_as.paa"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1,0,0}; + up[] = {0,1,0}; + dir[] = {0,0,0}; + pos[] = {0,0,0}; + }; +}; +class Stage5 +{ + texture="x\TBD_M119\addons\M119\tbd_m119\data\scope_smdi.paa"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1,0,0}; + up[] = {0,1,0}; + dir[] = {0,0,0}; + pos[] = {0,0,0}; + }; +}; +class Stage6 { + texture = "#(ai,64,64,1)fresnel(1.5,0.45)"; + uvSource = "tex"; + class uvTransform { + aside[] = { 1, 0, 0 }; + up[] = { 0, 1, 0 }; + dir[] = { 0, 0, 1 }; + pos[] = { 0, 0, 0 }; + }; +}; +class Stage7 { + texture = "a3\data_f\env_land_ca.paa"; + useWorldEnvMap = "true"; + uvSource = "tex"; + class uvTransform { + aside[] = { 1, 0, 0 }; + up[] = { 0, 1, 0 }; + dir[] = { 0, 0, 1 }; + pos[] = { 0, 0, 0 }; + }; +}; +class StageTI { + texture = "a3\data_f\default_vehicle_ti_ca.paa"; +}; \ No newline at end of file diff --git a/addons/m119/tbd_m119/data/scope_as.paa b/addons/m119/tbd_m119/data/scope_as.paa new file mode 100644 index 0000000..6cd2e99 Binary files /dev/null and b/addons/m119/tbd_m119/data/scope_as.paa differ diff --git a/addons/m119/tbd_m119/data/scope_co.paa b/addons/m119/tbd_m119/data/scope_co.paa new file mode 100644 index 0000000..fb2e6cd Binary files /dev/null and b/addons/m119/tbd_m119/data/scope_co.paa differ diff --git a/addons/m119/tbd_m119/data/scope_nohq.paa b/addons/m119/tbd_m119/data/scope_nohq.paa new file mode 100644 index 0000000..79ee56e Binary files /dev/null and b/addons/m119/tbd_m119/data/scope_nohq.paa differ diff --git a/addons/m119/tbd_m119/data/scope_smdi.paa b/addons/m119/tbd_m119/data/scope_smdi.paa new file mode 100644 index 0000000..7ec424b Binary files /dev/null and b/addons/m119/tbd_m119/data/scope_smdi.paa differ diff --git a/addons/m119/tbd_m119/data/seven.rvmat b/addons/m119/tbd_m119/data/seven.rvmat index d197e92..7b066ac 100644 --- a/addons/m119/tbd_m119/data/seven.rvmat +++ b/addons/m119/tbd_m119/data/seven.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 100; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/data/six.rvmat b/addons/m119/tbd_m119/data/six.rvmat index 28e0e8f..946deec 100644 --- a/addons/m119/tbd_m119/data/six.rvmat +++ b/addons/m119/tbd_m119/data/six.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 100; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/data/three.rvmat b/addons/m119/tbd_m119/data/three.rvmat index 1d03889..025190a 100644 --- a/addons/m119/tbd_m119/data/three.rvmat +++ b/addons/m119/tbd_m119/data/three.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 100; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/data/two.rvmat b/addons/m119/tbd_m119/data/two.rvmat index 84bb485..e47937d 100644 --- a/addons/m119/tbd_m119/data/two.rvmat +++ b/addons/m119/tbd_m119/data/two.rvmat @@ -12,7 +12,7 @@ diffuse[] = { 0.5, 0.5, 0.5, 0.5 }; forcedDiffuse[] = { 0, 0, 0, 1 }; emmisive[] = { 0, 0, 0, 1 }; specular[] = { 0.5, 0.5, 0.5, 0.5 }; -specularPower = 100; +specularPower = 30; PixelShaderID = "Super"; VertexShaderID = "Super"; diff --git a/addons/m119/tbd_m119/model.cfg b/addons/m119/tbd_m119/model.cfg index cc2b7a2..83e04c6 100644 --- a/addons/m119/tbd_m119/model.cfg +++ b/addons/m119/tbd_m119/model.cfg @@ -23,6 +23,7 @@ class CfgSkeletons "small_wheel", "otocvez", "handle_vertical", "otocvez", "barrel", "otochlaven", + "trigger", "otochlaven", "magazine_translation_bone", "otochlaven", "magazine", "magazine_translation_bone", "hydraulics", "otocvez", @@ -113,6 +114,18 @@ class Animations memory = 1; }; + class trigger_rotation { + type = "rotation"; + source = "trigger_rotation_source"; + selection = "trigger"; + axis = "axis_trigger"; + minValue = "0"; + maxValue = "1"; + angle0 = "rad 0"; + angle1 = "rad +30"; + memory = 1; + }; + class rotation_handle_vertical { type = "rotation"; source = "mainGun"; @@ -175,6 +188,20 @@ class Animations offset1 = "-2"; animPeriod = 10; }; + + class close_breach + { + type="translation"; + source="close_breach_source"; + selection="breach"; + axis="axis_breach"; + minValue=0.0; + maxValue=20; + offset0 = "0.0"; + offset1 = "-2"; + animPeriod = 10; + }; + class handle_breach { type="rotation"; @@ -197,8 +224,8 @@ class Animations axis="axis_hydraulics"; minValue = "rad -309"; maxValue = "rad +309"; - angle0 = "rad -360"; - angle1 = "rad +360"; + angle0 = "rad +360"; + angle1 = "rad -360"; memory = 1; }; diff --git a/addons/m119/tbd_m119/sounds/close.ogg b/addons/m119/tbd_m119/sounds/close.ogg new file mode 100644 index 0000000..35740d3 Binary files /dev/null and b/addons/m119/tbd_m119/sounds/close.ogg differ diff --git a/addons/m119/tbd_m119/sounds/reload.ogg b/addons/m119/tbd_m119/sounds/reload.ogg index 611aa82..d736038 100644 Binary files a/addons/m119/tbd_m119/sounds/reload.ogg and b/addons/m119/tbd_m119/sounds/reload.ogg differ