From 011e3294de56e4974505f28c1b798b35302129d7 Mon Sep 17 00:00:00 2001 From: Kex Date: Thu, 12 Dec 2024 15:24:58 +0100 Subject: [PATCH] Trenches - Use terrain material for dirt covers (#109) Use terrain material for dirt covers --- .../Materials/ACE_Trenches_MatTerrainObj.emat | 4 ++++ .../ACE_Trenches_MatTerrainObj.emat.meta | 17 +++++++++++++++++ .../ACE_DirtCover_01_long_v1.et | 8 ++++++++ .../FreeRoamBuilding/ACE_DirtCover_01_short.et | 8 ++++++++ .../E_ACE_DirtCover_01_long_v1.et | 6 ++++++ .../Fortifications/E_ACE_DirtCover_01_short.et | 6 ++++++ .../Fortifications/E_ACE_DirtCover_Base.et | 1 + 7 files changed, 50 insertions(+) create mode 100644 addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat create mode 100644 addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat.meta diff --git a/addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat b/addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat new file mode 100644 index 00000000..a2ff7cac --- /dev/null +++ b/addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat @@ -0,0 +1,4 @@ +MatTerrainObject : "{E0078B932EB17D27}Common/Materials/default_MatTerrainObj.emat" { + NoDecals 1 + EnableClutter 0 +} \ No newline at end of file diff --git a/addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat.meta b/addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat.meta new file mode 100644 index 00000000..49d8b5d1 --- /dev/null +++ b/addons/trenches/Common/Materials/ACE_Trenches_MatTerrainObj.emat.meta @@ -0,0 +1,17 @@ +MetaFileClass { + Name "{30369C94C941BE87}Common/Materials/ACE_Trenches_MatTerrainObj.emat" + Configurations { + EMATResourceClass PC { + } + EMATResourceClass XBOX_ONE : PC { + } + EMATResourceClass XBOX_SERIES : PC { + } + EMATResourceClass PS4 : PC { + } + EMATResourceClass PS5 : PC { + } + EMATResourceClass HEADLESS : PC { + } + } +} \ No newline at end of file diff --git a/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_long_v1.et b/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_long_v1.et index a581c142..4468fd35 100644 --- a/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_long_v1.et +++ b/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_long_v1.et @@ -24,6 +24,14 @@ GenericEntity : "{6E9190BC2713551D}Prefabs/Compositions/Slotted/BuildableComposi StaticModelEntity : "{39F7EE885940DC8F}Prefabs/Structures/Military/Fortifications/DirtCover_01/DirtCover_01_long_v1.et" { ID "60EB074D530F62D9" components { + MeshObject "{5272E314F6439B95}" { + Materials { + MaterialAssignClass "{626E47EC8BEE44D1}" { + SourceMaterial "DirtCover_01" + AssignedMaterial "{30369C94C941BE87}Common/Materials/ACE_Trenches_MatTerrainObj.emat" + } + } + } RplComponent "{60EB074D699B9E03}" { } Hierarchy "{60EB074D6AE72E0A}" { diff --git a/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_short.et b/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_short.et index cd4f62b6..4357cae5 100644 --- a/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_short.et +++ b/addons/trenches/Prefabs/Compositions/Misc/FreeRoamBuilding/ACE_DirtCover_01_short.et @@ -24,6 +24,14 @@ GenericEntity : "{6E9190BC2713551D}Prefabs/Compositions/Slotted/BuildableComposi StaticModelEntity : "{C1576E5555582214}Prefabs/Structures/Military/Fortifications/DirtCover_01/DirtCover_01_short.et" { ID "60EB0744E9059AF9" components { + MeshObject "{5272E314F6439B95}" { + Materials { + MaterialAssignClass "{626E47EC85C29C37}" { + SourceMaterial "DirtCover_01" + AssignedMaterial "{30369C94C941BE87}Common/Materials/ACE_Trenches_MatTerrainObj.emat" + } + } + } RplComponent "{60EB0744E4E104CE}" { } Hierarchy "{60EB0744E0E8CE69}" { diff --git a/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_long_v1.et b/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_long_v1.et index 4b1a7a04..410694d0 100644 --- a/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_long_v1.et +++ b/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_long_v1.et @@ -3,6 +3,12 @@ GenericEntity : "{3B9D178DEB635AFD}PrefabsEditable/Auto/Structures/Military/Fort components { MeshObject "{60ED256B7FE9D171}" { Object "{B119EC6E3C59AF3B}Assets/Structures/Military/Fortifications/DirtMounds/DirtCover_01_long_01.xob" + Materials { + MaterialAssignClass "{626E47F33C8B73DA}" { + SourceMaterial "DirtCover_01" + AssignedMaterial "{30369C94C941BE87}Common/Materials/ACE_Trenches_MatTerrainObj.emat" + } + } } SCR_EditableEntityComponent "{60ED256B631A65DC}" { m_UIInfo SCR_EditableEntityUIInfo "{60ED2568D69DDD17}" { diff --git a/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_short.et b/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_short.et index 71f88315..6b67efe3 100644 --- a/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_short.et +++ b/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_01_short.et @@ -3,6 +3,12 @@ GenericEntity : "{3B9D178DEB635AFD}PrefabsEditable/Auto/Structures/Military/Fort components { MeshObject "{60ED256B7FE9D171}" { Object "{155FCD2AE8BA59A3}Assets/Structures/Military/Fortifications/DirtMounds/DirtCover_01_short.xob" + Materials { + MaterialAssignClass "{626E47ECAB20A26B}" { + SourceMaterial "DirtCover_01" + AssignedMaterial "{30369C94C941BE87}Common/Materials/ACE_Trenches_MatTerrainObj.emat" + } + } } SCR_EditableEntityComponent "{60ED256B631A65DC}" { m_UIInfo SCR_EditableEntityUIInfo "{60ED2568D69DDD17}" { diff --git a/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_Base.et b/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_Base.et index 3ed059cb..69221ea2 100644 --- a/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_Base.et +++ b/addons/trenches/PrefabsEditable/Auto/Structures/Military/Fortifications/E_ACE_DirtCover_Base.et @@ -21,6 +21,7 @@ GenericEntity { m_aEntries { SCR_BasePreviewEntry "{60ED2568E4572001}" { m_iParentID -1 + m_Flags EDITABLE m_Shape MESH m_iPivotID "" }