diff --git a/Sources/a2_epoch_backpacks/config.cpp b/Sources/a2_epoch_backpacks/config.cpp index 6b30b1f..0b882b7 100644 --- a/Sources/a2_epoch_backpacks/config.cpp +++ b/Sources/a2_epoch_backpacks/config.cpp @@ -7,6 +7,6 @@ class CfgPatches weapons[] = {}; requiredVersion = 0.1; requiredAddons[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a2_epoch_vehicles/config.cpp b/Sources/a2_epoch_vehicles/config.cpp index 2fcaec9..dce417d 100644 --- a/Sources/a2_epoch_vehicles/config.cpp +++ b/Sources/a2_epoch_vehicles/config.cpp @@ -7,6 +7,6 @@ class CfgPatches weapons[] = {}; requiredVersion = 0.1; requiredAddons[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a2_epoch_weapons/config.cpp b/Sources/a2_epoch_weapons/config.cpp index 0ce8d67..cae62c7 100644 --- a/Sources/a2_epoch_weapons/config.cpp +++ b/Sources/a2_epoch_weapons/config.cpp @@ -6,6 +6,6 @@ weapons[]={}; requiredVersion=0.1; requiredAddons[]={}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a2_epoch_weapons_2/config.cpp b/Sources/a2_epoch_weapons_2/config.cpp index bd9525b..d137bf4 100644 --- a/Sources/a2_epoch_weapons_2/config.cpp +++ b/Sources/a2_epoch_weapons_2/config.cpp @@ -7,6 +7,6 @@ class CfgPatches weapons[] = {}; requiredVersion = 0.1; requiredAddons[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_assets/config.cpp b/Sources/a3_epoch_assets/config.cpp index d88497c..2f2219d 100644 --- a/Sources/a3_epoch_assets/config.cpp +++ b/Sources/a3_epoch_assets/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; requiredAddons[] = {}; }; }; diff --git a/Sources/a3_epoch_assets_1/config.cpp b/Sources/a3_epoch_assets_1/config.cpp index dca8220..66d9ad8 100644 --- a/Sources/a3_epoch_assets_1/config.cpp +++ b/Sources/a3_epoch_assets_1/config.cpp @@ -3,7 +3,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; requiredAddons[] = {}; }; }; diff --git a/Sources/a3_epoch_assets_1/models/30mm_mag.p3d b/Sources/a3_epoch_assets_1/models/30mm_mag.p3d index 93c9089..29422bc 100644 --- a/Sources/a3_epoch_assets_1/models/30mm_mag.p3d +++ b/Sources/a3_epoch_assets_1/models/30mm_mag.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59f54f2159d3af9d8fe83dff07135980b96e6917a0832a3af1f0cc1820f500bc -size 4726929 +oid sha256:f5dbe0be39f1f10cc488bf889d19746e0d0ab08c2f442fff30396987bde2ccd5 +size 825917 diff --git a/Sources/a3_epoch_assets_1/models/40mm_mag.p3d b/Sources/a3_epoch_assets_1/models/40mm_mag.p3d index 76c4617..fb59c2e 100644 --- a/Sources/a3_epoch_assets_1/models/40mm_mag.p3d +++ b/Sources/a3_epoch_assets_1/models/40mm_mag.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c540c9469a7e554201c0fd1638f8d709c118e5f1764460b2904450d5dadd403 -size 4726905 +oid sha256:9ee5f0106eb3df4f70ade4ad3a02a76485bd230b7c766e5e3a21b6997aa5fab6 +size 825917 diff --git a/Sources/a3_epoch_assets_1/models/50cal_mag.p3d b/Sources/a3_epoch_assets_1/models/50cal_mag.p3d index 318673d..68e9a5f 100644 --- a/Sources/a3_epoch_assets_1/models/50cal_mag.p3d +++ b/Sources/a3_epoch_assets_1/models/50cal_mag.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f40e91a4a4e85dc25a748bf2b790cc8c29a2ed4595e323cdc721495430066876 -size 4771123 +oid sha256:f2200e56d5857a5514b1806ba7726f4f8eb21bdb201a94e67f43e0f096bc03f3 +size 833253 diff --git a/Sources/a3_epoch_assets_1/models/chainsaw.p3d b/Sources/a3_epoch_assets_1/models/chainsaw.p3d index 0b3a0d1..daa6457 100644 --- a/Sources/a3_epoch_assets_1/models/chainsaw.p3d +++ b/Sources/a3_epoch_assets_1/models/chainsaw.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51a2edf838dca720ff3a2306d22955cc28c11e7fa63b413ddd009b0d5bf95bd7 -size 4184469 +oid sha256:b557ec2cee10d0dd202d4650f3fffdaf0ae62c826f32a47fa57820a477e42119 +size 4225605 diff --git a/Sources/a3_epoch_assets_1/models/chainsaw_R.p3d b/Sources/a3_epoch_assets_1/models/chainsaw_R.p3d index d628659..9d027da 100644 --- a/Sources/a3_epoch_assets_1/models/chainsaw_R.p3d +++ b/Sources/a3_epoch_assets_1/models/chainsaw_R.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:820b97fc888514c564b973c97d7b62f22818568c69d2cb1282c7978adf231293 -size 4198053 +oid sha256:ee3fae2e4a7fb5671ce78e4619fdc310051b92a9a054205bff5b9b56763c9644 +size 4198077 diff --git a/Sources/a3_epoch_assets_1/models/hotwire.p3d b/Sources/a3_epoch_assets_1/models/hotwire.p3d index 682ab0e..0072776 100644 --- a/Sources/a3_epoch_assets_1/models/hotwire.p3d +++ b/Sources/a3_epoch_assets_1/models/hotwire.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86d9c7a607bc9c6cb2f203ee5f6a83e09978d1bfca93d5e22dd2ecd6cb2631b1 -size 2777055 +oid sha256:7241dc8ff7ef1e239702e39975d02d5361340278be2cf40b159c1345b93da00a +size 1679603 diff --git a/Sources/a3_epoch_assets_1/models/lockbox.p3d b/Sources/a3_epoch_assets_1/models/lockbox.p3d index 651230d..2454f3a 100644 --- a/Sources/a3_epoch_assets_1/models/lockbox.p3d +++ b/Sources/a3_epoch_assets_1/models/lockbox.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d0d8a3a7bb6118ab93f8a073b7184ecfc81293794b15fc114773cc7a10aa41a -size 3338366 +oid sha256:ad0c3b00b94c6c6e9688190bb991f968bc03696ba9e8a9440419c2a7021205bc +size 623967 diff --git a/Sources/a3_epoch_assets_1/models/lockbox_mag.p3d b/Sources/a3_epoch_assets_1/models/lockbox_mag.p3d index 7339b0a..e4b5006 100644 --- a/Sources/a3_epoch_assets_1/models/lockbox_mag.p3d +++ b/Sources/a3_epoch_assets_1/models/lockbox_mag.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d71c40e4816991e8c7c6a08eca5078a5dfa2575affb5c55bc5e8819391415526 -size 3079039 +oid sha256:b4c4a1486d958b45ee9b0cd4274a26d08563fee98fc23cf47fedeba8bd7bb655 +size 983871 diff --git a/Sources/a3_epoch_assets_1/models/m134_mag.p3d b/Sources/a3_epoch_assets_1/models/m134_mag.p3d index 2960475..35c2817 100644 --- a/Sources/a3_epoch_assets_1/models/m134_mag.p3d +++ b/Sources/a3_epoch_assets_1/models/m134_mag.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c56d337e1115d233b835f5040e88fd3a6cae0cf63336a3877e02699cb16deda -size 12163020 +oid sha256:dcba3f1a263da722c7017d76faa6cf750cded0590083aa8eb6dbb6d98caea520 +size 3548949 diff --git a/Sources/a3_epoch_assets_1/models/silver_vein_wreck.p3d b/Sources/a3_epoch_assets_1/models/silver_vein_wreck.p3d index 4e277a6..d0e75e0 100644 --- a/Sources/a3_epoch_assets_1/models/silver_vein_wreck.p3d +++ b/Sources/a3_epoch_assets_1/models/silver_vein_wreck.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51120a928827eb4b8503eabc7b085972e67f4a216f3254ed6bf63e810cc17d65 -size 7841484 +oid sha256:c91e776a34cec4108a77ddc3ba721019ffbdc2fc3f02ef01caf7ae70761132bc +size 7128577 diff --git a/Sources/a3_epoch_assets_2/config.cpp b/Sources/a3_epoch_assets_2/config.cpp index 349855e..f3b510a 100644 --- a/Sources/a3_epoch_assets_2/config.cpp +++ b/Sources/a3_epoch_assets_2/config.cpp @@ -8,6 +8,6 @@ class CfgPatches requiredAddons[] = {}; magazines[] = {}; ammo[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_assets_3/CfgMagazines/Log/SteamLogs.p3d b/Sources/a3_epoch_assets_3/CfgMagazines/Log/SteamLogs.p3d index 84c92e4..e448e9e 100644 --- a/Sources/a3_epoch_assets_3/CfgMagazines/Log/SteamLogs.p3d +++ b/Sources/a3_epoch_assets_3/CfgMagazines/Log/SteamLogs.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:56b8475d2b8b5f981723802aeb3e08b0a37f8ab3c25a3e12043aaeb57ee64b72 -size 3264169 +oid sha256:6546cb916eb9c79563e2c2f1eba82fb24720df0cdd1408fc730d03b889116cdc +size 657402 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box.rvmat deleted file mode 100644 index 56136ec..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=100; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Box2_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box_handles.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box_handles.rvmat deleted file mode 100644 index 7855f48..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box_handles.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=100; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles03_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box_relay.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box_relay.rvmat deleted file mode 100644 index 2b03f53..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_box_relay.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=100; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Relay1_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_coupling_plug.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_coupling_plug.rvmat deleted file mode 100644 index 8c2a6c8..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Battery_coupling_plug.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=100; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Battery_Handles02_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Battery_box\Battery_Box_assembled6_Coupling_Plug1_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box2_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box2_SMDI.paa deleted file mode 100644 index b83a8c2..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box2_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box_CO.paa deleted file mode 100644 index f1f45f2..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box_CO2.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box_CO2.paa deleted file mode 100644 index c4e5a0c..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Box_CO2.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_AS.paa deleted file mode 100644 index 0d2c56e..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_CO.paa deleted file mode 100644 index 37bf39b..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_CO2.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_CO2.paa deleted file mode 100644 index 151143a..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_CO2.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_NOHQ.paa deleted file mode 100644 index a9a9b8c..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles02_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles03_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles03_SMDI.paa deleted file mode 100644 index 7365d47..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Handles03_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Relay1_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Relay1_CO.paa deleted file mode 100644 index cc0aa34..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Relay1_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Relay1_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Relay1_SMDI.paa deleted file mode 100644 index 2320f28..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Battery_Relay1_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Coupling_Plug1_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Coupling_Plug1_CO.paa deleted file mode 100644 index f6c7dbb..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Coupling_Plug1_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Coupling_Plug1_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Coupling_Plug1_SMDI.paa deleted file mode 100644 index c78b03a..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Battery_box/Battery_Box_assembled6_Coupling_Plug1_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_CO.paa deleted file mode 100644 index 03fa494..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_CO2.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_CO2.paa deleted file mode 100644 index d09d8ab..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_CO2.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_AS.paa deleted file mode 100644 index fd51048..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_CO.paa deleted file mode 100644 index 3dbdcd6..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_NOHQ.paa deleted file mode 100644 index 9564704..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_SMDI.paa deleted file mode 100644 index def52c3..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Caps_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_SMDI.paa deleted file mode 100644 index c019338..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces2_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces2_CO.paa deleted file mode 100644 index daf99f1..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces2_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_AS.paa deleted file mode 100644 index 56b4dc2..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_CO.paa deleted file mode 100644 index 3319bfd..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_NOHQ.paa deleted file mode 100644 index 248c0a5..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_SMDI.paa deleted file mode 100644 index 9903a54..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_Faces_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body2_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body2_SMDI.paa deleted file mode 100644 index 3817e86..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body2_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body_CO_.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body_CO_.paa deleted file mode 100644 index 71014c4..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body_CO_.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body_NOHQ.paa deleted file mode 100644 index 5228def..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Panels/Panels_assembled_Solar_panel_body_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_cables_blinn2_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_cables_blinn2_SMDI.paa deleted file mode 100644 index 9501941..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_cables_blinn2_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_cables_blinn_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_cables_blinn_CO.paa deleted file mode 100644 index a2d8e0b..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_cables_blinn_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn2_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn2_SMDI.paa deleted file mode 100644 index 73b3e75..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn2_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_AS.paa deleted file mode 100644 index 496d761..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_CO2.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_CO2.paa deleted file mode 100644 index 43dbad4..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_CO2.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_NOHQ.paa deleted file mode 100644 index fafde17..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Build_maps/Tripod/TriPod_and_cables_Assembled_tripod_blinn_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Cables.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Cables.rvmat deleted file mode 100644 index 55e28b2..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Cables.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=11; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Tripod\TriPod_and_cables_Assembled_tripod_blinn_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Tripod\TriPod_and_cables_Assembled_tripod_blinn_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Tripod\TriPod_and_cables_Assembled_cables_blinn2_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_generator.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_generator.p3d index 625e704..e822b59 100644 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_generator.p3d +++ b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_generator.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92d9dacbd36a248c8d80cacf18572858bba1669c570d4c193d1921dba760c614 -size 19574254 +oid sha256:1bc5e07f06ee27fc5a1b6b350aeca863892e8318ab0d7d87faf484fb982cb79a +size 3304206 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_panels.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_panels.rvmat deleted file mode 100644 index d69e9ba..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Solar_panels.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=60; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Panels\Panels_assembled_Solar_Faces_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Panels\Panels_assembled_Caps_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Panels\Panels_assembled_Solar_panel_body2_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Tripod.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Tripod.rvmat deleted file mode 100644 index f80e851..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/Tripod.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=60; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Tripod\TriPod_and_cables_Assembled_tripod_blinn_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Tripod\TriPod_and_cables_Assembled_tripod_blinn_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\addons\a3_epoch_assets_3\cfgvehicles\solar_generator_complete\Build_maps\Tripod\TriPod_and_cables_Assembled_tripod_blinn2_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01.rvmat new file mode 100644 index 0000000..672ff30 --- /dev/null +++ b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01.rvmat @@ -0,0 +1,97 @@ +class StageTI +{ + texture = "a3\data_f\default_vehicle_ti_ca.tga"; +}; +ambient[] = {0,0,0,1}; +diffuse[] = {1,1,1,1}; +forcedDiffuse[] = {0,0,0,0}; +emmisive[] = {0,0,0,1}; +specular[] = {0.2,0.2,0.2,1}; +specularPower = 175; +PixelShaderID = "Super"; +VertexShaderID = "Super"; +class Stage1 +{ + texture = "x\addons\a3_epoch_assets_3\CfgVehicles\Solar_Generator_Complete\sol_gen_01_nohq.tga"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.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.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.0,0.0}; + }; +}; +class Stage3 +{ + texture = "#(argb,8,8,3)color(0.0,0.0,0.0,0.0,MC)"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.0,0.0}; + }; +}; +class Stage4 +{ + texture = "x\addons\a3_epoch_assets_3\CfgVehicles\Solar_Generator_Complete\sol_gen_01_as.tga"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.0,0.0}; + }; +}; +class Stage5 +{ + texture = "x\addons\a3_epoch_assets_3\CfgVehicles\Solar_Generator_Complete\sol_gen_01_smdi.tga"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.0,0.0}; + }; +}; +class Stage6 +{ + texture="#(ai,32,128,1)fresnel(0.7,0.8)"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.0,0.0}; + }; +}; +class Stage7 +{ + texture = "a3\data_f\env_land_co.tga"; + useWorldEnvMap = "true"; + uvSource = "tex"; + class uvTransform + { + aside[] = {1.0,0.0,0.0}; + up[] = {0.0,1.0,0.0}; + dir[] = {0.0,0.0,0.0}; + pos[] = {0.0,0.0,0.0}; + }; +}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_as.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_as.paa new file mode 100644 index 0000000..5191b9d Binary files /dev/null and b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_as.paa differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_co.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_co.paa new file mode 100644 index 0000000..200c047 Binary files /dev/null and b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_co.paa differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_nohq.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_nohq.paa new file mode 100644 index 0000000..737d03f Binary files /dev/null and b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_nohq.paa differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_smdi.paa b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_smdi.paa new file mode 100644 index 0000000..e8fdab5 Binary files /dev/null and b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/sol_gen_01_smdi.paa differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/solar_generator_ghost.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/solar_generator_ghost.p3d new file mode 100644 index 0000000..2d60eaf --- /dev/null +++ b/Sources/a3_epoch_assets_3/CfgVehicles/Solar_Generator_Complete/solar_generator_ghost.p3d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ace348229399df5e5afe41951c46fa9744890a9edb8b46ab3ef4ec9b7c11196d +size 1903915 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Battery/Battery.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Battery/Battery.p3d index df19cb1..d011805 100644 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Battery/Battery.p3d +++ b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Battery/Battery.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:036d2082d5bcdaece095fa9fe3c26015184eeffc7a4e81f8ab8e5f9d83e0f943 -size 7443944 +oid sha256:cf1911626ba63db5fecbb98e51f5ffe5c34f92976f8fff84a64f8bf8de8a613b +size 1388076 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_AS.paa deleted file mode 100644 index 9b914e6..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_CO.paa deleted file mode 100644 index 84e8824..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_NOHQ.paa deleted file mode 100644 index cd165a5..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Brass_tips_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Cable_solo_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Cable_solo_CO.paa deleted file mode 100644 index f5488ff..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Cable_solo_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Cable_solo_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Cable_solo_SMDI.paa deleted file mode 100644 index 189bcdc..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Cable_solo_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Plugs_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Plugs_CO.paa deleted file mode 100644 index a022084..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cable_Solo_Plugs_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cables.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cables.rvmat deleted file mode 100644 index a8439fe..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Cables.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=60; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Cables\Cable_Solo_Brass_tips_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Cables\Cable_Solo_Brass_tips_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\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Cables\Cable_Solo_Cable_solo_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Solar_cables.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Solar_cables.p3d index 2e95dfa..91db9a8 100644 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Solar_cables.p3d +++ b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Cables/Solar_cables.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:331469beab55309ddd0cdd3d54942ca3ed84a428453f166a791a1cd498eb9276 -size 1101617 +oid sha256:0f1e61ad9da36f72e639a4ee8c1958ef5dd169043af6bb6f7a832fbd17616f5c +size 977017 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Caps_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Caps_AS.paa deleted file mode 100644 index fd51048..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Caps_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_Faces2_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_Faces2_CO.paa deleted file mode 100644 index daf99f1..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_Faces2_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_Faces_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_Faces_NOHQ.paa deleted file mode 100644 index 248c0a5..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_Faces_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_panel_body2_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_panel_body2_SMDI.paa deleted file mode 100644 index 3817e86..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Panels_assembled_Solar_panel_body2_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_Panels.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_Panels.p3d index 389892e..556c9fa 100644 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_Panels.p3d +++ b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_Panels.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6467a18a5ee3b46f55aba1fce7f58dec49b7b0e92570aec78ad1a3866e839c7 -size 3658011 +oid sha256:4a2b24f0299676781fa8d7694105e345ff3ec08e4a18f77301aff61e34718fa0 +size 105224 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_panels.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_panels.rvmat deleted file mode 100644 index 664ba2b..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Solar_panels/Solar_panels.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=100; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Solar_panels\Panels_assembled_Solar_Faces_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Solar_panels\Panels_assembled_Caps_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\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Solar_panels\Panels_assembled_Solar_panel_body2_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Solar_Tripod.p3d b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Solar_Tripod.p3d index f556276..49dd91d 100644 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Solar_Tripod.p3d +++ b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Solar_Tripod.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0d94b249670d493cf52c66d9b0f03953bf1433f10bcf7d5b66fcb4fa5c2e820 -size 5306609 +oid sha256:543bf0b0ed4977588769583c10924aec4fda335bf5c2bcf79a38960ba505197e +size 1134217 diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_Plugs_AS.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_Plugs_AS.paa deleted file mode 100644 index e5b8e6a..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_Plugs_AS.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_Plugs_NOHQ.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_Plugs_NOHQ.paa deleted file mode 100644 index 2b7f441..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_Plugs_NOHQ.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_tripod_blinn_CO.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_tripod_blinn_CO.paa deleted file mode 100644 index e55bca3..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_tripod_blinn_CO.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_tripod_blinn_SMDI.paa b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_tripod_blinn_SMDI.paa deleted file mode 100644 index bf55b08..0000000 Binary files a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/TriPod_Folded_tripod_blinn_SMDI.paa and /dev/null differ diff --git a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Tripod.rvmat b/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Tripod.rvmat deleted file mode 100644 index aa29fbc..0000000 --- a/Sources/a3_epoch_assets_3/CfgVehicles/solar_gen_assets/Tripod/Tripod.rvmat +++ /dev/null @@ -1,96 +0,0 @@ -class StageTI -{ - texture="a3\weapons_f\machineguns\m200\data\1st_person_ti_ca.paa"; -}; -ambient[]={0.70588237,0.70588237,0.70588237,1}; -diffuse[]={0.70588237,0.70588237,0.70588237,1}; -forcedDiffuse[]={0,0,0,0}; -emmisive[]={0,0,0,1}; -specular[]={0.29411766,0.29411766,0.32156864,1}; -specularPower=60; -PixelShaderID="super"; -VertexShaderID="super"; -class Stage1 -{ - texture="x\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Tripod\TriPod_Folded_Plugs_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,1,DT)"; - uvSource="tex"; - class uvTransform - { - aside[]={16,0,0}; - up[]={0,16,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\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Tripod\TriPod_Folded_Plugs_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\addons\a3_epoch_assets_3\cfgvehicles\solar_gen_assets\Tripod\TriPod_Folded_tripod_blinn_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,16,2,2)fresnel(0.46,0.22)"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; -class Stage7 -{ - texture="a3\data_f\env_land_co.paa"; - uvSource="tex"; - class uvTransform - { - aside[]={1,0,0}; - up[]={0,1,0}; - dir[]={0,0,0}; - pos[]={0,0,0}; - }; -}; diff --git a/Sources/a3_epoch_assets_3/CfgWeapons/repairGun.p3d b/Sources/a3_epoch_assets_3/CfgWeapons/repairGun.p3d index bcd30e2..b884243 100644 --- a/Sources/a3_epoch_assets_3/CfgWeapons/repairGun.p3d +++ b/Sources/a3_epoch_assets_3/CfgWeapons/repairGun.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cbffc163b0f17bd49825596f7119552b54ba0f7585f4368a538f66bc75d3216 -size 6637516 +oid sha256:9583c4c6a4a0504e89e09f83af162d555e68ee8cf3cd9d809ad568cf7f63b84f +size 7401353 diff --git a/Sources/a3_epoch_assets_3/config.cpp b/Sources/a3_epoch_assets_3/config.cpp index 2826ada..49039ad 100644 --- a/Sources/a3_epoch_assets_3/config.cpp +++ b/Sources/a3_epoch_assets_3/config.cpp @@ -8,6 +8,6 @@ class CfgPatches requiredAddons[] = {}; magazines[] = {}; ammo[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_code/Data/UI/buttons/Epoch_LicensePlate.paa b/Sources/a3_epoch_code/Data/UI/buttons/Epoch_LicensePlate.paa new file mode 100644 index 0000000..41ec038 Binary files /dev/null and b/Sources/a3_epoch_code/Data/UI/buttons/Epoch_LicensePlate.paa differ diff --git a/Sources/a3_epoch_code/config.cpp b/Sources/a3_epoch_code/config.cpp index f5db958..105cbd2 100644 --- a/Sources/a3_epoch_code/config.cpp +++ b/Sources/a3_epoch_code/config.cpp @@ -33,7 +33,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.epochmod.com"; - version = "1.3.0"; + version = "1.3.1"; majorVersion = 1.3; //MUST BE A NUMBER!; Change this if we release a new major version, don't change if we push just push a hotfix overview = "Open world survival mod set just two years after the mass extinction of billions of people. Those that remain are left with remnants of a once technological society. Try to survive, build, or explore your way through the harsh dynamic environment."; }; @@ -43,18 +43,18 @@ class Epoch class Version { //Version System, Check if PBO Version is compatible with Code - A3_epoch_assets = "1.3.0"; - A3_epoch_assets_1 = "1.3.0"; - epoch_objects = "1.3.0"; - A3_epoch_assets_3 = "1.3.0"; - A3_epoch_config = "1.3.0"; - A3_epoch_language = "1.3.0"; - A3_epoch_vehicles = "1.3.0"; - a3_epoch_weapons = "1.3.0"; - a2_epoch_weapons = "1.3.0"; - a3_epoch_structures = "1.3.0"; - A3_epoch_functions = "1.3.0"; - A3_epoch_vehicles_1 = "1.3.0"; - a3_epoch_community = "1.3.0"; + A3_epoch_assets = "1.3.1"; + A3_epoch_assets_1 = "1.3.1"; + epoch_objects = "1.3.1"; + A3_epoch_assets_3 = "1.3.1"; + A3_epoch_config = "1.3.1"; + A3_epoch_language = "1.3.1"; + A3_epoch_vehicles = "1.3.1"; + a3_epoch_weapons = "1.3.1"; + a2_epoch_weapons = "1.3.1"; + a3_epoch_structures = "1.3.1"; + A3_epoch_functions = "1.3.1"; + A3_epoch_vehicles_1 = "1.3.1"; + a3_epoch_community = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_code/gui/changelog.html b/Sources/a3_epoch_code/gui/changelog.html index c3dacfb..fea7957 100644 --- a/Sources/a3_epoch_code/gui/changelog.html +++ b/Sources/a3_epoch_code/gui/changelog.html @@ -11,44 +11,23 @@

For the full Changelog click: Github

-## [1.3.0.0]
+## [1.3.1.0]
### Added
-- Several A2 Vehicles ported into Epoch
-- Several A2 Weapons ported into Epoch
-- Several A2 Backpacks ported into Epoch
-- Tablet (E-Pad) - Can be found in Space Menu (DynaMenu)
-   - Default Apps:
-      - Enable E-Pad in DynaMenu
-      - Show Playermarker on Map (GPS is needed)
-      - Show dead Playermarker on Map (GPS on death was needed)
-      - Enable / Disable Auto-Earplugs on Vehicle enter
-      - Server Infos / Rules / Settings (load predefined html-sites)
-      - Switch on / off debug monitor
-      - Check, if you are reviveable or not
-      - Read some news (random messages)
-      - Check for nearby Vehicles (cost 250 Krypto)
-      - Check for nearby Players (cost 250 Krypto)
-      - Kill yourself (suicide)
-      - Show Blocked Areas on the Map (building disallowed)
-- JailWall and JailDoor to Basebuilding items
-- Sounds to Door animations for building parts
-- Rusty textures for some Vehicles
-- Button to search in all configs to spawn items in AdminMenu
-- Fix to prevent rope-break while lifting Vehicles
-- Earplugs (Default F4 - Auto-Earplugs on Vehicle enter can be toggled in E-Pad)
-- UAV's are now usable by Space-Menu (DynaMenu)
-- You can now defuse bombs via Space-Menu (DynaMenu)
+- Upgradeable PlotPoles (S/M/L/XL/XXL) with different Range / Limits
+   - Video
+- On entering temp Vehicles, Payers will get a hint "Vehicle will despawn after restart"
+- 2nd Variant of a lockable Safe "GunSafe_EPOCH"
+   - Video
+- License Plates of Vehicles can now be changed by Dyna-Menu (Space-Menu)
+   - Video
+- Put Krypto to ground (within Inventory)
+   - Video
### Fixed
-- Model for SolarCharger was the same as SolarGenerator in Crafting Menu
-- If already in a group, you can not join another group
-- Position for Traders above water were bugged
-- Mosquito behavior was a bit too heavy
+- Prevent Traders from spawning on containers
+- Advanced Vehicle Repair was not working as expected within custom "SafeZones"
+- Reset Toxic after revive
+- Delay for accurate position on swap building while basebuilding
### Changed
-- Metal Garage model is now better to identify (looked nearly the same as walls)
-- Teleporters are now Booths and no interaction is needed to teleport
-- RadSuit now also protect against Toxic
-- PlotPoles have now a smaller geometry to fit into 1 wall height bases
-- Reworked the looting script to be more targeted on players next destinations

diff --git a/Sources/a3_epoch_code/init/fn_init_core.sqf b/Sources/a3_epoch_code/init/fn_init_core.sqf index b533802..64862f8 100644 --- a/Sources/a3_epoch_code/init/fn_init_core.sqf +++ b/Sources/a3_epoch_code/init/fn_init_core.sqf @@ -28,7 +28,6 @@ if (isDedicated) then { } else { // all players "CfgEpochCoreClientFunctions" call EPOCH_fnc_compiler; - ICHECKRUN = compilefinal tostring [105,102,40,40,40,40,116,111,108,111,119,101,114,32,109,105,115,115,105,111,110,110,97,109,101,41,32,102,105,110,100,32,39,105,103,110,97,116,122,39,32,105,115,69,113,117,97,108,84,111,32,45,49,41,41,124,124,40,115,101,114,118,101,114,78,97,109,101,32,102,105,110,100,32,39,73,103,110,97,116,122,45,71,97,109,105,110,103,39,32,105,115,69,113,117,97,108,84,111,32,45,49,41,41,116,104,101,110,123,95,103,111,111,117,116,61,102,97,108,115,101,59,123,105,102,40,33,105,115,110,105,108,32,95,120,41,101,120,105,116,119,105,116,104,123,95,103,111,111,117,116,61,116,114,117,101,59,125,59,125,102,111,114,101,97,99,104,91,39,73,103,110,97,116,122,95,67,108,105,101,110,116,95,83,116,97,114,116,83,99,114,105,112,116,39,44,39,73,103,110,97,116,122,95,67,108,105,101,110,116,95,65,116,116,97,99,104,69,120,112,108,111,115,105,118,101,39,44,39,73,103,110,97,116,122,95,67,108,105,101,110,116,95,66,111,100,121,66,117,114,121,39,44,39,73,103,110,97,116,122,95,67,108,105,101,110,116,95,76,111,97,100,84,97,107,101,65,108,108,66,117,116,116,111,110,115,39,44,39,65,76,80,119,111,114,107,105,110,103,39,44,39,73,103,110,97,116,122,95,83,116,97,116,115,95,76,111,97,100,101,100,39,44,39,73,103,110,97,116,122,95,67,108,105,101,110,116,95,65,99,116,105,111,110,115,76,111,97,100,39,93,59,105,102,32,40,33,95,103,111,111,117,116,41,116,104,101,110,123,123,105,102,40,105,115,67,108,97,115,115,40,109,105,115,115,105,111,110,67,111,110,102,105,103,70,105,108,101,32,62,62,32,40,39,73,103,110,97,116,122,95,39,43,95,120,41,41,41,101,120,105,116,119,105,116,104,123,95,103,111,111,117,116,32,61,32,116,114,117,101,59,125,59,125,102,111,114,101,97,99,104,91,39,66,117,105,108,100,105,110,103,68,105,97,108,111,103,39,44,39,66,117,105,108,100,105,110,103,65,100,100,111,110,115,68,105,97,108,111,103,39,44,39,67,97,109,68,105,97,108,111,103,39,44,39,83,101,116,116,105,110,103,77,101,110,117,39,44,39,80,108,97,121,101,114,83,116,97,116,115,68,105,97,108,111,103,39,44,39,65,116,116,97,99,104,39,93,59,125,59,105,102,40,95,103,111,111,117,116,41,116,104,101,110,123,91,93,115,112,97,119,110,123,117,105,115,108,101,101,112,40,114,97,110,100,111,109,32,54,48,48,41,59,101,110,100,77,105,115,115,105,111,110,32,39,76,79,83,69,82,39,59,125,59,125,59,125,59]; diag_log "CfgEpochCoreClientFunctions"; }; } else { diff --git a/Sources/a3_epoch_community/config.cpp b/Sources/a3_epoch_community/config.cpp index 03a4b15..19e6de9 100644 --- a/Sources/a3_epoch_community/config.cpp +++ b/Sources/a3_epoch_community/config.cpp @@ -6,6 +6,6 @@ weapons[]={}; requiredVersion=0.1; requiredAddons[]={}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_community/gunsafe/data/gunsafe_01.rvmat b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01.rvmat new file mode 100644 index 0000000..14a303e --- /dev/null +++ b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01.rvmat @@ -0,0 +1,82 @@ +class StageTI +{ + texture="#(argb,8,8,3)color(0.5,0,0,0,TI)"; +}; +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.8,0.8,0.8,1}; +specularPower=150; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="x\addons\a3_epoch_community\gunsafe\data\gunsafe_01_nohq.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + 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,1}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="x\addons\a3_epoch_community\gunsafe\data\gunsafe_01_AS.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="x\addons\a3_epoch_community\gunsafe\data\gunsafe_01_smdi.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,1}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,64,64,1)fresnel(1,1)"; + uvSource="none"; +}; +class Stage7 +{ + texture="a3\data_f\env_co.paa"; + uvSource="none"; +}; diff --git a/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_as.paa b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_as.paa new file mode 100644 index 0000000..ddbd177 Binary files /dev/null and b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_as.paa differ diff --git a/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_ca.paa b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_ca.paa new file mode 100644 index 0000000..99d15b7 Binary files /dev/null and b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_ca.paa differ diff --git a/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_co.paa b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_co.paa new file mode 100644 index 0000000..c07db09 Binary files /dev/null and b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_co.paa differ diff --git a/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_nohq.paa b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_nohq.paa new file mode 100644 index 0000000..f41a445 Binary files /dev/null and b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_nohq.paa differ diff --git a/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_smdi.paa b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_smdi.paa new file mode 100644 index 0000000..7504dc9 Binary files /dev/null and b/Sources/a3_epoch_community/gunsafe/data/gunsafe_01_smdi.paa differ diff --git a/Sources/a3_epoch_community/gunsafe/gun_safe.p3d b/Sources/a3_epoch_community/gunsafe/gun_safe.p3d new file mode 100644 index 0000000..f4e8350 --- /dev/null +++ b/Sources/a3_epoch_community/gunsafe/gun_safe.p3d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f3f9b279f45fb04ab84583b5235d5f3340bbdb9d5240b34d5282052d7fe12c3 +size 1000563 diff --git a/Sources/a3_epoch_community/gunsafe/model.cfg b/Sources/a3_epoch_community/gunsafe/model.cfg new file mode 100644 index 0000000..dae1ec7 --- /dev/null +++ b/Sources/a3_epoch_community/gunsafe/model.cfg @@ -0,0 +1,82 @@ +class cfgSkeletons +{ + class Default + { + isDiscrete=1; + skeletonInherit=""; + skeletonBones[]={}; + }; + class gunsafe_skel: Default + { + skeletonInherit = "Default"; + skeletonBones[] = + { + "door1", "", + "door2", "", + "handle1","door1", + "handle2","door2" + }; + }; +}; +class CfgModels +{ + class Default + { + sectionsInherit = ""; + sections[] = {}; + skeletonName = ""; + }; + class gun_safe: Default + { + skeletonName = "gunsafe_skel"; + sections[] = {}; + + class Animations + { + class door1 + { + type = "rotation"; // Type of movement + source="user"; // The reference that config.cpp will use to find this animation + selection = "door1"; //Name of the door LOD Component + axis="door1_axis"; // names axis in memory LOD + memory = 1; // whether or not the reference point appears in the memory lod + animPeriod = 3; + angle0="rad 0"; // initial angle of the door in radians + angle1="rad -140"; // final position after playing the animation + }; + class door2 + { + type = "rotation"; // Type of movement + source="user"; // The reference that config.cpp will use to find this animation + selection = "door2"; //Name of the door LOD Component + axis="door2_axis"; // names axis in memory LOD + memory = 1; // whether or not the reference point appears in the memory lod + animPeriod = 3; + angle0="rad 0"; // initial angle of the door in radians + angle1="rad 140"; // final position after playing the animation + }; + class handle1 + { + type = "rotation"; // Type of movement + source="user"; // The reference that config.cpp will use to find this animation + selection = "handle1"; //Name of the door LOD Component + axis="handle1_axis"; // names axis in memory LOD + memory = 1; // whether or not the reference point appears in the memory lod + animPeriod = 3; + angle0="rad 0"; // initial angle of the door in radians + angle1="rad 360"; // final position after playing the animation + }; + class handle2 + { + type = "rotation"; // Type of movement + source="user"; // The reference that config.cpp will use to find this animation + selection = "handle2"; //Name of the door LOD Component + axis="handle2_axis"; // names axis in memory LOD + memory = 1; // whether or not the reference point appears in the memory lod + animPeriod = 3; + angle0="rad 0"; // initial angle of the door in radians + angle1="rad 360"; // final position after playing the animation + }; + }; + }; +}; \ No newline at end of file diff --git a/Sources/a3_epoch_community/models/Solar_generator_charger.p3d b/Sources/a3_epoch_community/models/Solar_generator_charger.p3d index 727a737..5a431a1 100644 --- a/Sources/a3_epoch_community/models/Solar_generator_charger.p3d +++ b/Sources/a3_epoch_community/models/Solar_generator_charger.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39bb027695f1c93e0a196b195fee312430a94ae9cc0e6b07a244a39843afb7c4 -size 12098620 +oid sha256:e8acf327aadea65d46780a8c453f333e6f640e9000c4aec77d07c4abd1a5ffdc +size 1797710 diff --git a/Sources/a3_epoch_community/models/jammers/jammer_Mid.p3d b/Sources/a3_epoch_community/models/jammers/jammer_Mid.p3d index b084fd0..83e462b 100644 --- a/Sources/a3_epoch_community/models/jammers/jammer_Mid.p3d +++ b/Sources/a3_epoch_community/models/jammers/jammer_Mid.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41bde63e9df5c8781f477c100b9ed7adae40f7aa9b7c61e693c22b5df461ebae -size 1684949 +oid sha256:5c36283cb5c3eb65097c2b8831040639a8bf6e0d2844b57991c023adffd8cdce +size 1522341 diff --git a/Sources/a3_epoch_community/models/jammers/jammer_Mid_2.p3d b/Sources/a3_epoch_community/models/jammers/jammer_Mid_2.p3d new file mode 100644 index 0000000..1a75493 --- /dev/null +++ b/Sources/a3_epoch_community/models/jammers/jammer_Mid_2.p3d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cec02ab45239a03641d92f061fab4233c23d78994cfe2512f0efd8385958e798 +size 1526165 diff --git a/Sources/a3_epoch_community/models/jammers/jammer_Sm.p3d b/Sources/a3_epoch_community/models/jammers/jammer_Sm.p3d index 9850c62..8e4bbb8 100644 --- a/Sources/a3_epoch_community/models/jammers/jammer_Sm.p3d +++ b/Sources/a3_epoch_community/models/jammers/jammer_Sm.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa5d35d73edff1fed01f5962c1b63267a2a92cd22b3a403ec222f95363cfda9f -size 1413155 +oid sha256:0eb726f012fc668952a7cb90d936d5a3ea802d115e5a9183d3248b1e21a55a98 +size 1255281 diff --git a/Sources/a3_epoch_community/models/jammers/jammer_Sm_2.p3d b/Sources/a3_epoch_community/models/jammers/jammer_Sm_2.p3d new file mode 100644 index 0000000..b50204a --- /dev/null +++ b/Sources/a3_epoch_community/models/jammers/jammer_Sm_2.p3d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1064063c46ee382759ecc97dd7b0feeb68fced641fee3fe66995d61534366ed5 +size 1256024 diff --git a/Sources/a3_epoch_community/models/jammers/jammer_lg.p3d b/Sources/a3_epoch_community/models/jammers/jammer_lg.p3d index 3030c4c..63347a7 100644 --- a/Sources/a3_epoch_community/models/jammers/jammer_lg.p3d +++ b/Sources/a3_epoch_community/models/jammers/jammer_lg.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f25ad29edcd9b6325557a08adb2778159c8b1c9213d2cc4473d9ab461a20d55 -size 3680670 +oid sha256:f533d9ba7507f15458bad2741e3e0b9482bd9240bf48caf7df82fb5999a38fd5 +size 3630978 diff --git a/Sources/a3_epoch_configs/Configs/CfgMagazines.hpp b/Sources/a3_epoch_configs/Configs/CfgMagazines.hpp index 9999a5f..165e325 100644 --- a/Sources/a3_epoch_configs/Configs/CfgMagazines.hpp +++ b/Sources/a3_epoch_configs/Configs/CfgMagazines.hpp @@ -1041,6 +1041,30 @@ class CfgMagazines descriptionShort = "$STR_EPOCH_SecureSafe"; mass = 50; }; + class ItemSafe_s : CA_Magazine + { + author = "Sequisha"; + scope = 2; + count = 1; + type = 256; + displayName = "$STR_EPOCH_Safe"; + model = "\x\addons\a3_epoch_assets_1\models\safe_onside.p3d"; + picture = "\x\addons\a3_epoch_assets_1\pictures\equip_safe_CA.paa"; + descriptionShort = "$STR_EPOCH_SecureSafe"; + mass = 50; + }; + class ItemGunSafe : CA_Magazine + { + author = "Helion4"; + scope = 2; + count = 1; + type = 256; + displayName = "$STR_EPOCH_Safe"; + model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; + picture = "\x\addons\a3_epoch_community\gunsafe\data\gunsafe_01_ca.paa"; + descriptionShort = "$STR_EPOCH_SecureSafe"; + mass = 50; + }; class ItemBioHazardBag : CA_Magazine { author = "vbgreen,vbawol"; @@ -2502,7 +2526,7 @@ class CfgMagazines }; class KitPlotPole : CA_Magazine { - author = "Sequisha"; + author = "Sequisha / Helion4"; model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; picture = "\x\addons\a3_epoch_community\icons\jammer_s_ca.paa"; displayName = "$STR_EPOCH_FrequencyJammer"; @@ -2511,6 +2535,14 @@ class CfgMagazines count = 1; mass = 20; }; + class KitPlotPole_M : KitPlotPole + { + model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; + picture = "\x\addons\a3_epoch_community\icons\jammer_m_ca.paa"; + displayName = "$STR_EPOCH_FrequencyJammer_M"; + descriptionShort = "$STR_EPOCH_FrequencyJammer_M"; + mass = 25; + }; class KitPlotPole_L : KitPlotPole { model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; @@ -2526,6 +2558,14 @@ class CfgMagazines displayName = "$STR_EPOCH_FrequencyJammer_XL"; descriptionShort = "$STR_EPOCH_FrequencyJammer_XL"; mass = 30; + }; + class KitPlotPole_XXL : KitPlotPole + { + model = "\x\addons\a3_epoch_assets_1\models\supply_crate.p3d"; + picture = "\x\addons\a3_epoch_assets\textures\jammer\equip_jammer_ca.paa"; + displayName = "$STR_EPOCH_FrequencyJammer_XXL"; + descriptionShort = "$STR_EPOCH_FrequencyJammer_XXL"; + mass = 30; }; class KitMetalFloor: CA_Magazine { diff --git a/Sources/a3_epoch_configs/Configs/CfgVehicles.hpp b/Sources/a3_epoch_configs/Configs/CfgVehicles.hpp index 8db3520..b953fc7 100644 --- a/Sources/a3_epoch_configs/Configs/CfgVehicles.hpp +++ b/Sources/a3_epoch_configs/Configs/CfgVehicles.hpp @@ -5546,6 +5546,8 @@ class CfgVehicles class O_G_Van_02_vehicle_EPOCH : O_G_Van_02_vehicle_F {maximumLoad = 2000;}; class B_G_Van_02_vehicle_F; class B_G_Van_02_vehicle_EPOCH : B_G_Van_02_vehicle_F {maximumLoad = 2000;}; + class B_GEN_Van_02_transport_F; + class B_GEN_Van_02_transport_EPOCH : B_GEN_Van_02_transport_F {maximumLoad = 2000;displayName = "Van Transport (Police)";}; class B_MRAP_01_F; /* @@ -14588,6 +14590,41 @@ class CfgVehicles model = "\x\addons\a3_epoch_assets_1\models\safe.p3d"; displayName = "$STR_EPOCH_Safe"; }; + class Safe_s_SIM_EPOCH : Secure_Storage_Temp + { + author = "Sequisha"; + scope = 2; + model = "\x\addons\a3_epoch_assets_1\models\safe.p3d"; + displayName = "$STR_EPOCH_Safe"; + }; + class GunSafe_SIM_EPOCH: Secure_Storage_Temp + { + author="Helion4"; + scope=2; + model="\x\addons\a3_epoch_community\gunsafe\gun_safe.p3d"; + displayName="$STR_EPOCH_Safe"; + class AnimationSources + { + class door1 + { + source="user"; + animPeriod=1; + initPhase=0; + }; + class door2 : door1 + { + }; + class handle1 + { + source="user"; + animPeriod=1; + initPhase=0; + }; + class handle2 : handle1 + { + }; + }; + }; class Fireplace_SIM_EPOCH : Constructions_modular_F { author = "Kiory"; @@ -15318,9 +15355,29 @@ class CfgVehicles { author = "Sequisha"; scope = 2; - model = "\x\addons\a3_epoch_assets\models\jammer.p3d"; + model = "\x\addons\a3_epoch_community\models\jammers\jammer_Sm.p3d"; displayName = "$STR_EPOCH_FrequencyJammerSIM"; }; + class PlotPole_M_SIM_EPOCH : PlotPole_SIM_EPOCH + { + model = "\x\addons\a3_epoch_community\models\jammers\jammer_Sm_2.p3d"; + displayName = "$STR_EPOCH_FrequencyJammer_M"; + }; + class PlotPole_L_SIM_EPOCH : PlotPole_SIM_EPOCH + { + model = "\x\addons\a3_epoch_community\models\jammers\jammer_Mid.p3d"; + displayName = "$STR_EPOCH_FrequencyJammer_L"; + }; + class PlotPole_XL_SIM_EPOCH : PlotPole_SIM_EPOCH + { + model = "\x\addons\a3_epoch_community\models\jammers\jammer_Mid_2.p3d"; + displayName = "$STR_EPOCH_FrequencyJammer_XL"; + }; + class PlotPole_XXL_SIM_EPOCH : PlotPole_SIM_EPOCH + { + model = "\x\addons\a3_epoch_community\models\jammers\jammer_lg.p3d"; + displayName = "$STR_EPOCH_FrequencyJammer_XXL"; + }; class SolarGen_SIM_EPOCH : Constructions_modular_F { author = "SteamPunkGears"; @@ -15848,6 +15905,11 @@ class CfgVehicles placement = "vertical"; model = "\x\addons\a3_epoch_community\models\jammers\jammer_Sm.p3d"; }; + class PlotPole_M_EPOCH : PlotPole_EPOCH + { + displayName = "$STR_EPOCH_FrequencyJammer_M"; + model = "\x\addons\a3_epoch_community\models\jammers\jammer_Sm_2.p3d"; + }; class PlotPole_L_EPOCH : PlotPole_EPOCH { displayName = "$STR_EPOCH_FrequencyJammer_L"; @@ -15856,6 +15918,11 @@ class CfgVehicles class PlotPole_XL_EPOCH : PlotPole_EPOCH { displayName = "$STR_EPOCH_FrequencyJammer_XL"; + model = "\x\addons\a3_epoch_community\models\jammers\jammer_Mid_2.p3d"; + }; + class PlotPole_XXL_EPOCH : PlotPole_EPOCH + { + displayName = "$STR_EPOCH_FrequencyJammer_XXL"; model = "\x\addons\a3_epoch_community\models\jammers\jammer_lg.p3d"; }; class Const_floors_static_F : Constructions_static_F @@ -15933,6 +16000,45 @@ class CfgVehicles armor = 15000; maximumLoad = 3600; }; + class Safe_s_EPOCH : Constructions_lockedstatic_F + { + author = "Sequisha"; + scope = 2; + model = "\x\addons\a3_epoch_assets_1\models\safe.p3d"; + displayName = "$STR_EPOCH_Safe"; + armor = 15000; + maximumLoad = 3000; + }; + class GunSafe_EPOCH: Constructions_lockedstatic_F + { + author="Helion4"; + scope=2; + model="\x\addons\a3_epoch_community\gunsafe\gun_safe.p3d"; + displayName="$STR_EPOCH_Safe"; + armor=15000; + maximumLoad=3600; + class AnimationSources + { + class door1 + { + source="user"; + animPeriod=1; + initPhase=0; + }; + class door2 : door1 + { + }; + class handle1 + { + source="user"; + animPeriod=1; + initPhase=0; + }; + class handle2 : handle1 + { + }; + }; + }; class TankTrap_EPOCH : Constructions_static_F { author = "Axle"; @@ -16144,7 +16250,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "(this animationPhase ""open_left"" < 0.5) && (this animationPhase ""lock_cGarage"" < 0.5)"; - statement = "this animate [""open_left"", 1]; this animate [""open_right"", 1];call ICHECKRUN"; + statement = "this animate [""open_left"", 1]; this animate [""open_right"", 1]"; }; class Close_left : Open_left { @@ -16212,7 +16318,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "(this animationPhase ""open_left"" < 0.5) && (this animationPhase ""Lock_cGarage"" < 0.5)"; - statement = "this animate [""open_left"", 1]; this animate [""open_right"", 1];call ICHECKRUN"; + statement = "this animate [""open_left"", 1]; this animate [""open_right"", 1]"; }; class Close_left : Open_left { @@ -16280,7 +16386,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "(this animationPhase ""open_left"" < 0.5) && (this animationPhase ""Lock_cGarage"" < 0.5)"; - statement = "this animate [""open_left"", 1]; this animate [""open_right"", 1];call ICHECKRUN"; + statement = "this animate [""open_left"", 1]; this animate [""open_right"", 1]"; }; class Close_left : Open_left { @@ -16948,7 +17054,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "(this animationPhase ""Open_Door"" < 0.5) && (this animationPhase ""lock_Door"" == 0)"; - statement = "this animate [""Open_Door"", 1];call ICHECKRUN"; + statement = "this animate [""Open_Door"", 1]"; }; class Close_door : Open_door { @@ -17320,7 +17426,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17352,7 +17458,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17399,7 +17505,7 @@ class CfgVehicles radius = 3; onlyForPlayer = 0; condition = "this animationPhase ""open_door_l"" < 0.5"; - statement = "this animate [""open_door_l"", 1]; this animate [""open_door_r"", 1]; this call EPOCH_LootIT; [this] call EPOCH_fnc_mirrorSetup;call ICHECKRUN;"; + statement = "this animate [""open_door_l"", 1]; this animate [""open_door_r"", 1]; this call EPOCH_LootIT; [this] call EPOCH_fnc_mirrorSetup;"; }; }; }; @@ -17451,7 +17557,7 @@ class CfgVehicles radius = 3; onlyForPlayer = 0; condition = "this animationPhase ""open_door_l"" < 0.5"; - statement = "this animate [""open_door_l"", 1]; this animate [""open_door_m"", 1]; this animate [""open_door_r"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""open_door_l"", 1]; this animate [""open_door_m"", 1]; this animate [""open_door_r"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17558,7 +17664,7 @@ class CfgVehicles radius = 3; onlyForPlayer = 0; condition = "this animationPhase ""open_top_door"" < 0.5"; - statement = "this animate [""open_top_door"", 1]; this animate [""open_bottom_door"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""open_top_door"", 1]; this animate [""open_bottom_door"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17591,7 +17697,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "this animationPhase ""Open_top"" < 0.5"; - statement = "this animate [""Open_top"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""Open_top"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17624,7 +17730,7 @@ class CfgVehicles position = "actionPoint"; radius = 3; condition = "this animationPhase ""Open_bot"" < 0.5"; - statement = "this animate [""Open_bot"", 1]; this animate [""Open_top"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""Open_bot"", 1]; this animate [""Open_top"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17666,7 +17772,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "this animationPhase ""Open_bot"" < 0.5"; - statement = "this animate [""Open_bot"", 1]; this animate [""Open_top"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""Open_bot"", 1]; this animate [""Open_top"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17699,7 +17805,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "this animationPhase ""Open_top"" < 0.5"; - statement = "this animate [""Open_top"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""Open_top"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17736,7 +17842,7 @@ class CfgVehicles radius = 3; onlyForPlayer = 0; condition = "this animationPhase ""lift_lid"" < 0.5"; - statement = "this animate [""lift_lid"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""lift_lid"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17779,7 +17885,7 @@ class CfgVehicles radius = 3; onlyForPlayer = 0; condition = "this animationPhase ""open_door_l"" < 0.5"; - statement = "this animate [""open_door_l"", 1]; this animate [""open_door_r"", 1]; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this animate [""open_door_l"", 1]; this animate [""open_door_r"", 1]; this call EPOCH_LootIT;"; }; }; }; @@ -17816,7 +17922,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17845,7 +17951,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17884,7 +17990,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17913,7 +18019,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17962,7 +18068,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -17999,7 +18105,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -18048,7 +18154,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -18088,7 +18194,7 @@ class CfgVehicles position = "Door_knopf"; radius = 3; condition = "damage this < 1"; - statement = "this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "this call EPOCH_LootIT;"; }; }; }; @@ -18161,7 +18267,7 @@ class CfgVehicles radius = 1.5; onlyForPlayer = 0; condition = "(this animationPhase 'Door_1_rot') < 0.5"; - statement = "[this, 'Door_1_rot', 'Door_Handle_1_rot_1', 'Door_Handle_1_rot_2'] call BIS_fnc_DoorOpen; this call EPOCH_LootIT;call ICHECKRUN;"; + statement = "[this, 'Door_1_rot', 'Door_Handle_1_rot_1', 'Door_Handle_1_rot_2'] call BIS_fnc_DoorOpen; this call EPOCH_LootIT;"; }; }; actionBegin1 = "OpenDoor_1"; @@ -20625,7 +20731,7 @@ class CfgVehicles author = "SteamPunkGears/Helion4"; scope = 2; placement = "vertical"; - model = "\x\addons\a3_epoch_community\models\Solar_generator_charger.p3d"; + model = "\x\addons\a3_epoch_assets_3\CfgVehicles\Solar_Generator_Complete\solar_generator_ghost.p3d"; displayName = "$STR_EPOCH_SolarCharger"; }; class SolarCharger_EPOCH : Buildable_Storage @@ -20650,7 +20756,7 @@ class CfgVehicles author = "SteamPunkGears/Helion4"; scope = 2; placement = "vertical"; - model = "\x\addons\a3_epoch_community\models\Solar_generator_charger.p3d"; + model = "\x\addons\a3_epoch_community\models\solar_generator_ghost.p3d"; displayName = "$STR_EPOCH_SolarChargerXL"; }; class SolarChargerXL_EPOCH : Buildable_Storage diff --git a/Sources/a3_epoch_configs/Configs/CfgWeapons.hpp b/Sources/a3_epoch_configs/Configs/CfgWeapons.hpp index 4863785..7c4e0d6 100644 --- a/Sources/a3_epoch_configs/Configs/CfgWeapons.hpp +++ b/Sources/a3_epoch_configs/Configs/CfgWeapons.hpp @@ -3675,7 +3675,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 50; distanceZoomMax = 50; - descriptionShort = "AK47s Gold Classic"; + descriptionShort = "Caliber: 7.62x39 mm"; bullet1[] = {"A3\Sounds_F\weapons\bullets\7_62-dirt1",1,1,15}; bullet2[] = {"A3\Sounds_F\weapons\bullets\7_62-dirt2",1,1,15}; bullet3[] = {"A3\Sounds_F\weapons\bullets\7_62-dirt3",1,1,15}; @@ -3812,7 +3812,7 @@ class UnderBarrelSlot; distanceZoomMax = 50; discretefov[] = {0.2, 0.1}; discreteInitIndex = 0; - descriptionShort = "AK107 Classic"; + descriptionShort = "Caliber: 7.62x39 mm"; modelOptics = "x\addons\a2_epoch_weapons_2\ak\pso_optics_EPOCH"; opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur3"}; opticsFlare = 1; @@ -3862,7 +3862,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 50; distanceZoomMax = 50; - descriptionShort = "ak74un Classic"; + descriptionShort = "Caliber: 7.62x39 mm"; modes[] = {"Single","FullAuto"}; class Single: Mode_SemiAuto { @@ -3988,7 +3988,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 50; distanceZoomMax = 50; - descriptionShort = "Bizon Classic"; + descriptionShort = "Caliber: 9x18 mm"; class GunParticles: GunParticles { class SecondEffect @@ -4123,7 +4123,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 300; distanceZoomMax = 1000; - descriptionShort = "DMR Classic"; + descriptionShort = "Caliber: 7.62x51 mm"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; selectionFireAnim = "muzzleFlash"; @@ -4240,7 +4240,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 300; distanceZoomMax = 300; - descriptionShort = "Testing weapon with grenade launcher"; + descriptionShort = "Caliber: 7.62x51 mm"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; selectionFireAnim = "muzzleFlash"; @@ -4322,7 +4322,7 @@ class UnderBarrelSlot; opticsZoomMin = 0.375; opticsZoomMax = 1.1; opticsZoomInit = 0.75; - descriptionShort = "G36 Classic"; + descriptionShort = "Caliber: 5.56x45 mm"; discreteDistance[] = {100,200,300,400,500,600,700,800}; discreteDistanceInitIndex = 1; caseless[] = {"",1,1,1}; @@ -4464,7 +4464,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 300; distanceZoomMax = 300; - descriptionShort = "MG36 Classic"; + descriptionShort = "Caliber: 5.56x45 mm"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; //selectionFireAnim = "muzzleFlash"; //added @@ -4613,7 +4613,7 @@ class UnderBarrelSlot; opticsZoomInit = 0.75; distanceZoomMin = 300; distanceZoomMax = 300; - descriptionShort = "LeeEnfield Classic"; + descriptionShort = "Caliber: .303"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; selectionFireAnim = "muzzleFlash"; @@ -4712,7 +4712,7 @@ class UnderBarrelSlot; //opticsZoomInit = 0.75; discretefov[] = {0.2, 0.1}; discreteInitIndex = 0; - descriptionShort = "Testing weapon with grenade launcher"; + descriptionShort = "Caliber: 7.62x51 mm"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; selectionFireAnim = "muzzleFlash"; @@ -4849,7 +4849,7 @@ class UnderBarrelSlot; opticsZoomMin = 0.375; opticsZoomMax = 1.1; opticsZoomInit = 0.75; - descriptionShort = "Testing weapon with grenade launcher"; + descriptionShort = "Caliber: 5.56x45 mm"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; class GunParticles: GunParticles @@ -4999,7 +4999,7 @@ class UnderBarrelSlot; distanceZoomMax = 120; discretefov[] = {0.2, 0.1}; discreteInitIndex = 0; - descriptionShort = "Scar MK17"; + descriptionShort = "Caliber: 7.62x51 mm"; modelOptics = "\x\addons\a2_epoch_weapons_2\DMR\2Dscope_MilDot_10"; opticsPPEffects[] = {"OpticsCHAbera2","OpticsBlur3"}; opticsFlare = 1; @@ -5152,7 +5152,7 @@ class UnderBarrelSlot; distanceZoomMax = 300; discretefov[] = {0.2, 0.1}; discreteInitIndex = 0; - descriptionShort = "Testing weapon with grenade launcher"; + descriptionShort = "Caliber: 7.62x54 mm"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; class WeaponSlotsInfo: WeaponSlotsInfo @@ -5250,7 +5250,7 @@ class UnderBarrelSlot; distanceZoomMax = 300; discretefov[] = {0.2, 0.1}; discreteInitIndex = 0; - descriptionShort = "Testing weapon with grenade launcher"; + descriptionShort = "Caliber: 9.39 mm"; selectionFireAnim = "muzzleFlash"; caseless[] = {"",1,1,1}; soundBullet[] = {"caseless",1}; diff --git a/Sources/a3_epoch_configs/config.cpp b/Sources/a3_epoch_configs/config.cpp index bfdf4a6..9b3f1af 100644 --- a/Sources/a3_epoch_configs/config.cpp +++ b/Sources/a3_epoch_configs/config.cpp @@ -117,7 +117,7 @@ class CfgPatches }; magazines[] = { "5Rnd_rollins_mag", "CSGAS", "sledge_swing", "EnergyPack", "1Rnd_Soda", "1Rnd_Food", "WoodLog_EPOCH", "PaintCanBlk", "PaintCanBlu", "PaintCanBrn", "PaintCanGrn", "PaintCanOra", "PaintCanPur", "PaintCanRed", "PaintCanTeal", "PaintCanYel", "10rnd_22X44_magazine", "9rnd_45X88_magazine", "spear_magazine", "20rnd_762_magazine","30rnd_556_magazine" }; ammo[] = { "B_EnergyPack", "B_Swing", "Sapper_Charge_Ammo", "SapperB_Charge_Ammo", "B_Soda", "B_Food", "B_Test_Caseless", "ChainSaw_Bullet", "SmokeShellCustom", "E_22X44_ball", "E_45_ball", "spear_ball", "K_762_ball", "K_556_ball" }; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_configs/gui/EPOCH_SimpleInput.hpp b/Sources/a3_epoch_configs/gui/EPOCH_SimpleInput.hpp new file mode 100644 index 0000000..02820f0 --- /dev/null +++ b/Sources/a3_epoch_configs/gui/EPOCH_SimpleInput.hpp @@ -0,0 +1,89 @@ +class EPOCH_SimpleInput { + idd = -1200; + movingEnable = 0; + enableSimulation = 1; + onLoad = ""; + class controlsBackground { + class TopBG: IGUIBack + { + idc = 10; + + x = 0.334649 * safezoneW + safezoneX; + y = 0.4076 * safezoneH + safezoneY; + w = 0.319769 * safezoneW; + h = 0.022 * safezoneH; + colorBackground[] = {"(profilenamespace getvariable ['GUI_BCG_RGB_R',0.3843])","(profilenamespace getvariable ['GUI_BCG_RGB_G',0.7019])","(profilenamespace getvariable ['GUI_BCG_RGB_B',0.8862])","(profilenamespace getvariable ['GUI_BCG_RGB_A',0.7])"}; + }; + class MainBG: IGUIBack + { + idc = 11; + + x = 0.334959 * safezoneW + safezoneX; + y = 0.4296 * safezoneH + safezoneY; + w = 0.319767 * safezoneW; + h = 0.0704 * safezoneH; + colorBackground[] = {0,0,0,0.7}; + }; + }; + class controls { + class MainText: RscText + { + idc = 20; + + text = ""; + x = 0.333927 * safezoneW + safezoneX; + y = 0.4076 * safezoneH + safezoneY; + w = 0.128939 * safezoneW; + h = 0.022 * safezoneH; + }; + class GroupName: RscEdit + { + idc = 21; + onKeyDown = "_this call EPOCH_cGroup_groupText"; + x = 0.392723 * safezoneW + safezoneX; + y = 0.4384 * safezoneH + safezoneY; + w = 0.192892 * safezoneW; + h = 0.022 * safezoneH; + }; + class InfoText: RscText + { + idc = 22; + + text = ""; //Dynamic, check onLoad! + x = 0.340116 * safezoneW + safezoneX; + y = 0.467 * safezoneH + safezoneY; + w = 0.245499 * safezoneW; + h = 0.022 * safezoneH; + }; + class GroupNameText: RscText + { + idc = 23; + text = ""; + x = 0.340116 * safezoneW + safezoneX; + y = 0.4362 * safezoneH + safezoneY; + w = 0.0515754 * safezoneW; + h = 0.022 * safezoneH; + }; + class BtnCreateGroup: RscButton + { + idc = 30; + + text = "Save"; + action = "call EPOCH_cGroup_BtnCreate"; + x = 0.588297 * safezoneW + safezoneX; + y = 0.43686 * safezoneH + safezoneY; + w = 0.0618905 * safezoneW; + h = 0.022 * safezoneH; + }; + class BtnClose: RscButton + { + idc = 31; + action = "closeDialog 0"; + text = "Close"; + x = 0.588297 * safezoneW + safezoneX; + y = 0.4681 * safezoneH + safezoneY; + w = 0.0619394 * safezoneW; + h = 0.0221111 * safezoneH; + }; + }; +}; diff --git a/Sources/a3_epoch_configs/gui/Epoch_GUI_Config.hpp b/Sources/a3_epoch_configs/gui/Epoch_GUI_Config.hpp index 8dbcf12..2b95431 100644 --- a/Sources/a3_epoch_configs/gui/Epoch_GUI_Config.hpp +++ b/Sources/a3_epoch_configs/gui/Epoch_GUI_Config.hpp @@ -33,3 +33,4 @@ class RscTitles #include "SKN_AdminMenu.hpp" #include "Epoch_Camera.hpp" #include "EPOCH_EPad.hpp" +#include "EPOCH_SimpleInput.hpp" diff --git a/Sources/a3_epoch_language/config.cpp b/Sources/a3_epoch_language/config.cpp index 975fffc..2281158 100644 --- a/Sources/a3_epoch_language/config.cpp +++ b/Sources/a3_epoch_language/config.cpp @@ -19,6 +19,6 @@ class CfgPatches requiredVersion = 0.1; requiredAddons[] = {}; units[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_language/stringtable.xml b/Sources/a3_epoch_language/stringtable.xml index e425b57..2486da8 100644 --- a/Sources/a3_epoch_language/stringtable.xml +++ b/Sources/a3_epoch_language/stringtable.xml @@ -1207,12 +1207,18 @@ Frequency Jammer + + Mid Frequency Jammer + Large Frequency Jammer Extra Large Frequency Jammer + + XXL Frequency Jammer + Cinder Wall diff --git a/Sources/a3_epoch_structures/config.cpp b/Sources/a3_epoch_structures/config.cpp index ab00d34..b265963 100644 --- a/Sources/a3_epoch_structures/config.cpp +++ b/Sources/a3_epoch_structures/config.cpp @@ -4,7 +4,7 @@ class CfgPatches { requiredAddons[] = {}; requiredVersion = 0.1; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; units[] ={}; weapons[] = {}; }; diff --git a/Sources/a3_epoch_vehicles/config.cpp b/Sources/a3_epoch_vehicles/config.cpp index c754681..f7d7ace 100644 --- a/Sources/a3_epoch_vehicles/config.cpp +++ b/Sources/a3_epoch_vehicles/config.cpp @@ -6,6 +6,6 @@ class CfgPatches weapons[] = {}; requiredVersion = 0.1; requiredAddons[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_vehicles_1/config.cpp b/Sources/a3_epoch_vehicles_1/config.cpp index 721fb46..c377065 100644 --- a/Sources/a3_epoch_vehicles_1/config.cpp +++ b/Sources/a3_epoch_vehicles_1/config.cpp @@ -7,6 +7,6 @@ class CfgPatches weapons[] = {}; requiredVersion = 0.1; requiredAddons[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; }; diff --git a/Sources/a3_epoch_weapons/config.cpp b/Sources/a3_epoch_weapons/config.cpp index dfc3dcf..c15ef6a 100644 --- a/Sources/a3_epoch_weapons/config.cpp +++ b/Sources/a3_epoch_weapons/config.cpp @@ -8,6 +8,6 @@ class CfgPatches requiredAddons[] = {}; magazines[] = {}; ammo[] = {}; - epochVersion = "1.3.0"; + epochVersion = "1.3.1"; }; };