Skip to content

Commit 35c3ae3

Browse files
authored
feat(HotelPvP): ArmaVision Spectator improvements (#14)
* Disable logo and thirds helpers by default in spectator * Treat all characters as players in ArmaVision * Enable Editor auto register on Hostage prefab * All entities will be considered friendly in spectator mode
1 parent d7712d0 commit 35c3ae3

File tree

5 files changed

+64
-1
lines changed

5 files changed

+64
-1
lines changed

addons/HotelPvP/Prefabs/Characters/Factions/CIV/Character_CIV_Hostage.et

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ SCR_ChimeraCharacter : "{76EC8248377D0989}Prefabs/Characters/Factions/CIV/Busine
88
m_UIInfo SCR_EditableEntityUIInfo "{5298E609432D192D}" {
99
m_Image "{427D14CBB8EDE5A7}UI/Textures/EditorPreviews/Characters/CIV/Character_CIV_Businessman_3.edds"
1010
}
11+
m_bAutoRegister ALWAYS
1112
}
1213
SCR_FactionAffiliationComponent "{60DC952FF79A02F1}" {
1314
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
SCR_EditorModeEntity : "{E56F54E533ACE527}Prefabs/Editor/Modes/EditorModeBase.et" {
2+
ID "54F2889696CCD840"
3+
components {
4+
SCR_EntitiesManagerEditorComponent "{52A48BF20F6B4D98}" {
5+
m_aFilters {
6+
SCR_EntityTypesEditableEntityFilter "{5142DD05614C93FD}" {
7+
m_aTypes {
8+
2
9+
}
10+
}
11+
}
12+
}
13+
SCR_MenuOverlaysEditorComponent "{5165445D06363A31}" {
14+
m_aLayers {
15+
SCR_EditorMenuOverlayLayer "{51909549449D92DB}" {
16+
m_iCurrentOverlay 1
17+
}
18+
SCR_EditorMenuOverlayLayer "{518B6BE9CD64EBE5}" {
19+
m_iCurrentOverlay 0
20+
}
21+
}
22+
}
23+
}
24+
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
MetaFileClass {
2+
Name "{1CF7F1998A0257B1}Prefabs/Editor/Modes/EditorModePhoto.et"
3+
Configurations {
4+
EntityTemplateResourceClass PC {
5+
}
6+
EntityTemplateResourceClass XBOX_ONE : PC {
7+
}
8+
EntityTemplateResourceClass XBOX_SERIES : PC {
9+
}
10+
EntityTemplateResourceClass PS4 : PC {
11+
}
12+
EntityTemplateResourceClass PS5 : PC {
13+
}
14+
EntityTemplateResourceClass HEADLESS : PC {
15+
}
16+
}
17+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[BaseContainerProps(), SCR_BaseContainerCustomTitleEnum(EEditableEntityState, "m_State")]
2+
modded class SCR_FriendlyEditableEntityFilter
3+
{
4+
protected AFM_SpectatorComponent m_pAFM_SpectatorComponent;
5+
6+
override bool CanAdd(SCR_EditableEntityComponent entity)
7+
{
8+
bool canAdd = super.CanAdd(entity);
9+
10+
// Consider all entities as friendly when in spectator mode
11+
return canAdd || (m_pAFM_SpectatorComponent && m_pAFM_SpectatorComponent.IsSpectatorActive());
12+
}
13+
14+
override void EOnEditorActivate()
15+
{
16+
super.EOnEditorActivate();
17+
18+
PlayerController pc = GetGame().GetPlayerController();
19+
m_pAFM_SpectatorComponent = AFM_SpectatorComponent.Cast(pc.FindComponent(AFM_SpectatorComponent));
20+
}
21+
}

addons/HotelPvP/worlds/TestWorld_Arland_Layers/HotelPvP.layer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ AFM_FactoryPvPGameMode AFM_FactoryPvPGameMode1 : "{AE65065120241660}Prefabs/MP/M
2626
SCR_SpawnPoint : "{4FEA25583D0975F7}Prefabs/MP/Spawning/SpawnPoint_USSR.et" {
2727
coords 1380.512 36.323 2352.694
2828
}
29-
SCR_ChimeraCharacter : "{516BB3588749F92A}Prefabs/Characters/Factions/CIV/Businessman/Character_CIV_Hostage.et" {
29+
SCR_ChimeraCharacter : "{516BB3588749F92A}Prefabs/Characters/Factions/CIV/Character_CIV_Hostage.et" {
3030
coords 1373.921 37.581 2346.078
3131
}
3232
SCR_SpawnPoint : "{5A2220DD0C16958B}Prefabs/MP/Spawning/SpawnPoint_US.et" {

0 commit comments

Comments
 (0)