Skip to content

Commit

Permalink
Add ambient flyby modules (#49)
Browse files Browse the repository at this point in the history
* Add module base prefab and scripts

* Pass editable component instead of entity

* Add ambient flyby module

* Update stringtable

* Rearrange module base methods and add init done bool

* Make sure init done only runs on authority

* Update meta file

* Introduce module placing actions

* Make module not streamable by default

* Change default image for module

* Add placing actions for opening editor browser

* Require entity in world placing action

* Sleep placing action

* Spawn default occupants placing action

* Force writing module attributes

* Proper prefix for placing actions

* Proper prefix modules

* Prefix EditableModuleComponent

* Rename placing actions to init actions

* Add on placing canceled event

* Fix localization and prefab prefixes

* Fix editable component

* Do not delete immediately

* Update meta

* Create separate config for module attributes

* Add attributes

* Add module type content browser filter

* Add module type filter

* Disable simulation for spawned assets until all init actions are done

* Restore previous simulation state

* Revise module activation

* Revise init actions

* Implement GME_VehicleHelper methods

* Add exception handling to init actions

* Prevent race condition between canceling and notification

* Implement additional group helper methods

* Add support for spawning helicopter crew

* Implement method for getting faction from editable entity

* Implement invoker for when a group's members spawned

* Assign number to module type enum

* Fix spelling

* Use vehicle helper for spawning crew

* Terminate simulation when rotor breaks

* Add null checks

* Fix spelling of formatting

* Add missing comma

* Fix missing braces

* Delete helo when pilot is missing

* Merge branch 'master' into feature/ambient-flyby
  • Loading branch information
Kexanone authored Oct 28, 2024
1 parent b3fcc09 commit 0a50297
Show file tree
Hide file tree
Showing 35 changed files with 998 additions and 68 deletions.
7 changes: 7 additions & 0 deletions addons/GME/Configs/Core/EditableEntityCore.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ SCR_EditableEntityCore {
}
}
m_EntityLabels {
SCR_EditableEntityCoreLabelSetting "{6207444BA7AD66AD}" {
m_Info SCR_UIInfo "{6207444BD843E277}" {
Name "#GME-Editor_ContentBrowser_Filter_AI_Name"
}
m_LabelType GME_MODULETYPE_AI
m_LabelGroupType GME_MODULETYPE
}
SCR_EditableEntityCoreLabelSetting "{62072CE65FF44D4F}" {
m_Info SCR_UIInfo "{62072CE64AA7F64D}" {
Name "#GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
Expand Down
4 changes: 2 additions & 2 deletions addons/GME/Configs/Editor/AttributeLists/Edit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ SCR_EditorAttributeList : "{F3D6C6D25642352C}Configs/Editor/AttributeLists/Edit.
m_CategoryConfig "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
m_baseValues SCR_EditorAttributeBaseValues "{59916BDD3EC05B0B}" {
m_sSliderValueFormating "#GME-Editor_Attribute_CompletionRadius_ValueFormating"
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Length"
m_fMin 0
m_fStep 1
m_iDecimals 0
Expand Down Expand Up @@ -157,4 +157,4 @@ SCR_EditorAttributeList : "{F3D6C6D25642352C}Configs/Editor/AttributeLists/Edit.
m_Layout "{9CFE6B0F98097C35}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_MultilineEditBox.layout"
}
}
}
}
42 changes: 42 additions & 0 deletions addons/GME/Configs/Editor/AttributeLists/GME_Modules.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,47 @@
SCR_EditorAttributeList {
m_aAttributes {
GME_Modules_Attribute_FlybyHeight "{62071A6417B8AC69}" {
m_UIInfo SCR_EditorAttributeUIInfo "{62071BC6AA4E61DF}" {
Name "#GME-Modules_Attribute_Height_Name"
}
m_CategoryConfig "{416C6E9ECC3D231D}Configs/Editor/AttributeCategories/Entity.conf"
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
m_baseValues SCR_EditorAttributeBaseValues "{62071BC68FE0D611}" {
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Length"
m_fMin 10
m_fMax 5000
m_fStep 10
m_iDecimals 0
}
}
GME_Modules_Attribute_FlybySpeed "{62071A641437D257}" {
m_UIInfo SCR_EditorAttributeUIInfo "{62071BC6ABDCFC7A}" {
Name "#GME-Modules_Attribute_Speed_Name"
}
m_CategoryConfig "{416C6E9ECC3D231D}Configs/Editor/AttributeCategories/Entity.conf"
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
m_baseValues SCR_EditorAttributeBaseValues "{62071BC68DE0AF21}" {
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Speed"
m_fMin 50
m_fMax 1000
m_fStep 10
m_iDecimals 0
}
}
GME_Modules_Attribute_FlybyStartDistance "{62071A64154DC719}" {
m_UIInfo SCR_EditorAttributeUIInfo "{62071BC683932DA7}" {
Name "#GME-Modules_Attribute_StartDistance_Name"
}
m_CategoryConfig "{416C6E9ECC3D231D}Configs/Editor/AttributeCategories/Entity.conf"
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
m_baseValues SCR_EditorAttributeBaseValues "{62071BC63144EDC4}" {
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Length"
m_fMin 1000
m_fMax 10000
m_fStep 100
m_iDecimals 0
}
}
GME_Modules_Attribute_SelectLZ "{62057E5007D74B92}" {
m_UIInfo SCR_EditorAttributeUIInfo "{62057E5005337FF0}" {
Name "#GME-Modules_LZ_name"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
SCR_PlaceableEntitiesRegistry {
m_Prefabs +{
"{7B68FEDCB026BB2F}Prefabs/Items/Misc/IntelligenceFolder_E_01/E_GME_IntelFolder_01.et"
"{6CC280CC94A055EA}PrefabsEditable/Modules/Ambient/E_GME_Modules_AmbientUH1HFlyby.et"
"{D7381CF65B75B4D1}PrefabsEditable/Modules/Ambient/E_GME_Modules_AmbientMi8MTFlyby.et"
"{B11FA818A134D5AE}PrefabsEditable/Modules/Reinforcements/E_GME_Modules_RallyPoint.et"
"{06E1603BE4D59D63}PrefabsEditable/Modules/Reinforcements/E_GME_Modules_LZ.et"
"{8A52B1DEF3843C1D}PrefabsEditable/Modules/Reinforcements/E_GME_Modules_SpawnReinforcements.et"
Expand Down
16 changes: 8 additions & 8 deletions addons/GME/Configs/Notifications/Notifications.conf
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
SCR_NotificationConfig {
m_aNotificationDisplayData {
GME_NotificationPrefabDisplayName "{620508C5276F3855}" {
m_NotificationKey GME_PLACE_PREFAB_FIRST
m_info SCR_UINotificationInfo "{620508C56085F3FC}" {
Name "#GME-Notification_PLACE_PREFAB_FIRST"
Icon "{2ABEFFC36C5EA842}UI/Textures/Notifications/Notification_Default_Failed.edds"
m_cNotificationColor WARNING
}
}
SCR_NotificationPlayerTargetEditableEntity "{628CBCCF4C4BA4D1}" {
m_NotificationKey GME_PLAYER_PICKED_UP_ITEM
m_info SCR_UINotificationInfo "{628CBCCF461F8F6E}" {
Expand All @@ -16,5 +8,13 @@ SCR_NotificationConfig {
m_EditorSetPositionData AUTO_SET_POSITION_ONCE
}
}
GME_NotificationPrefabDisplayName "{620508C5276F3855}" {
m_NotificationKey GME_PLACE_PREFAB_FIRST
m_info SCR_UINotificationInfo "{620508C56085F3FC}" {
Name "#GME-Notification_PLACE_PREFAB_FIRST"
Icon "{2ABEFFC36C5EA842}UI/Textures/Notifications/Notification_Default_Failed.edds"
m_cNotificationColor WARNING
}
}
}
}
18 changes: 16 additions & 2 deletions addons/GME/Language/GME_localization.cs_cz.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ StringTableRuntime {
"GME-ActionList_TeleportToSquadmate_Description"
"GME-ActionList_TeleportToSquadmate_Name"
"GME-Editor_Attribute_CompletionRadius_Name"
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
"GME-Editor_Attribute_CompletionType_All_Name"
"GME-Editor_Attribute_CompletionType_Any_Name"
"GME-Editor_Attribute_CompletionType_Leader_Name"
Expand All @@ -32,12 +31,20 @@ StringTableRuntime {
"GME-Editor_Attribute_Stance_Name"
"GME-Editor_Attribute_Stance_Prone_Name"
"GME-Editor_Attribute_Stance_Stand_Name"
"GME-Editor_Attribute_ValueFormatting_Length"
"GME-Editor_Attribute_ValueFormatting_Speed"
"GME-Editor_Attribute_VisibilityToggle_Name"
"GME-Editor_AttributeCategory_Waypoint_Name"
"GME-Editor_ContentBrowser_Filter_AI_Name"
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
"GME-Modules_AmbientFlyby_Mi8MT_name"
"GME-Modules_AmbientFlyby_UH1H_name"
"GME-Modules_Attribute_Height_Name"
"GME-Modules_Attribute_RTBAndDespawn_Name"
"GME-Modules_Attribute_Speed_Name"
"GME-Modules_Attribute_StartDistance_Name"
"GME-Modules_Attribute_StayAtLZ_Name"
"GME-Modules_Attribute_VehicleBehavior_Name"
"GME-Modules_LZ_name"
Expand All @@ -54,7 +61,6 @@ StringTableRuntime {
"Teleportujte jednotku k jednomu z jejích spolubojovníci"
"Teleportujte se ke spolubojovníci"
"Poloměr dokončení"
"%1 m"
"Všichni"
"Jakýkoliv"
"Velitel"
Expand All @@ -81,12 +87,20 @@ StringTableRuntime {
"Postawa"
"Zalehnout"
"Stát"
"%1 m"
"%1 km/h"
"Viditelnost"
"Bod trasy"
"AI"
"Reinforcements"
"Module Type"
"Choose garrison"
"Ambient Mi-8MT Flyby"
"Ambient UH-1H Flyby"
"Height"
"RTB and Despawn"
"Speed"
"Start distance"
"Stay at LZ"
"Vehicle behaviour"
"LZ"
Expand Down
18 changes: 16 additions & 2 deletions addons/GME/Language/GME_localization.de_de.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ StringTableRuntime {
"GME-ActionList_TeleportToSquadmate_Description"
"GME-ActionList_TeleportToSquadmate_Name"
"GME-Editor_Attribute_CompletionRadius_Name"
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
"GME-Editor_Attribute_CompletionType_All_Name"
"GME-Editor_Attribute_CompletionType_Any_Name"
"GME-Editor_Attribute_CompletionType_Leader_Name"
Expand All @@ -32,12 +31,20 @@ StringTableRuntime {
"GME-Editor_Attribute_Stance_Name"
"GME-Editor_Attribute_Stance_Prone_Name"
"GME-Editor_Attribute_Stance_Stand_Name"
"GME-Editor_Attribute_ValueFormatting_Length"
"GME-Editor_Attribute_ValueFormatting_Speed"
"GME-Editor_Attribute_VisibilityToggle_Name"
"GME-Editor_AttributeCategory_Waypoint_Name"
"GME-Editor_ContentBrowser_Filter_AI_Name"
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
"GME-Modules_AmbientFlyby_Mi8MT_name"
"GME-Modules_AmbientFlyby_UH1H_name"
"GME-Modules_Attribute_Height_Name"
"GME-Modules_Attribute_RTBAndDespawn_Name"
"GME-Modules_Attribute_Speed_Name"
"GME-Modules_Attribute_StartDistance_Name"
"GME-Modules_Attribute_StayAtLZ_Name"
"GME-Modules_Attribute_VehicleBehavior_Name"
"GME-Modules_LZ_name"
Expand All @@ -54,7 +61,6 @@ StringTableRuntime {
"Teleportiere die Einheit zu einem seiner Kameraden"
"Zum Kameraden teleportieren"
"Abschlussradius"
"%1 m"
"Alle"
"Irgendeiner"
"Anführer"
Expand All @@ -81,12 +87,20 @@ StringTableRuntime {
"Haltung"
"Hinlegen"
"Aufstehen"
"%1 m"
"%1 km/h"
"Sichtbarkeit"
"Wegpunkt"
"KI"
"Verstärkungen"
"Modultyp"
"Besatzung auswählen"
"Atmosphärischer Vorbeiflug eines Mi-9MT"
"Atmosphärischer Vorbeiflug eines UH-1H"
"Höhe"
"Zurück und Löschen"
"Tempo"
"Startdistanz"
"Bei LZ verbleiben"
"Fahrzeugverhalten"
"LZ"
Expand Down
18 changes: 16 additions & 2 deletions addons/GME/Language/GME_localization.en_us.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ StringTableRuntime {
"GME-ActionList_TeleportToSquadmate_Description"
"GME-ActionList_TeleportToSquadmate_Name"
"GME-Editor_Attribute_CompletionRadius_Name"
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
"GME-Editor_Attribute_CompletionType_All_Name"
"GME-Editor_Attribute_CompletionType_Any_Name"
"GME-Editor_Attribute_CompletionType_Leader_Name"
Expand All @@ -32,12 +31,20 @@ StringTableRuntime {
"GME-Editor_Attribute_Stance_Name"
"GME-Editor_Attribute_Stance_Prone_Name"
"GME-Editor_Attribute_Stance_Stand_Name"
"GME-Editor_Attribute_ValueFormatting_Length"
"GME-Editor_Attribute_ValueFormatting_Speed"
"GME-Editor_Attribute_VisibilityToggle_Name"
"GME-Editor_AttributeCategory_Waypoint_Name"
"GME-Editor_ContentBrowser_Filter_AI_Name"
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
"GME-Modules_AmbientFlyby_Mi8MT_name"
"GME-Modules_AmbientFlyby_UH1H_name"
"GME-Modules_Attribute_Height_Name"
"GME-Modules_Attribute_RTBAndDespawn_Name"
"GME-Modules_Attribute_Speed_Name"
"GME-Modules_Attribute_StartDistance_Name"
"GME-Modules_Attribute_StayAtLZ_Name"
"GME-Modules_Attribute_VehicleBehavior_Name"
"GME-Modules_LZ_name"
Expand All @@ -54,7 +61,6 @@ StringTableRuntime {
"Teleport unit to one of its squadmates"
"Teleport To Squadmate"
"Completion radius"
"%1 m"
"All"
"Any"
"Leader"
Expand All @@ -81,12 +87,20 @@ StringTableRuntime {
"Stance"
"Prone"
"Stand"
"%1 m"
"%1 km/h"
"Visibility"
"Waypoint"
"AI"
"Reinforcements"
"Module Type"
"Choose garrison"
"Ambient Mi-8MT Flyby"
"Ambient UH-1H Flyby"
"Height"
"RTB and Despawn"
"Speed"
"Start distance"
"Stay at LZ"
"Vehicle behaviour"
"LZ"
Expand Down
18 changes: 16 additions & 2 deletions addons/GME/Language/GME_localization.es_es.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ StringTableRuntime {
"GME-ActionList_TeleportToSquadmate_Description"
"GME-ActionList_TeleportToSquadmate_Name"
"GME-Editor_Attribute_CompletionRadius_Name"
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
"GME-Editor_Attribute_CompletionType_All_Name"
"GME-Editor_Attribute_CompletionType_Any_Name"
"GME-Editor_Attribute_CompletionType_Leader_Name"
Expand All @@ -32,12 +31,20 @@ StringTableRuntime {
"GME-Editor_Attribute_Stance_Name"
"GME-Editor_Attribute_Stance_Prone_Name"
"GME-Editor_Attribute_Stance_Stand_Name"
"GME-Editor_Attribute_ValueFormatting_Length"
"GME-Editor_Attribute_ValueFormatting_Speed"
"GME-Editor_Attribute_VisibilityToggle_Name"
"GME-Editor_AttributeCategory_Waypoint_Name"
"GME-Editor_ContentBrowser_Filter_AI_Name"
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
"GME-Modules_AmbientFlyby_Mi8MT_name"
"GME-Modules_AmbientFlyby_UH1H_name"
"GME-Modules_Attribute_Height_Name"
"GME-Modules_Attribute_RTBAndDespawn_Name"
"GME-Modules_Attribute_Speed_Name"
"GME-Modules_Attribute_StartDistance_Name"
"GME-Modules_Attribute_StayAtLZ_Name"
"GME-Modules_Attribute_VehicleBehavior_Name"
"GME-Modules_LZ_name"
Expand All @@ -54,7 +61,6 @@ StringTableRuntime {
"Unidad de teletransporte a uno de sus compañeros de escuadrón"
"Teletransportarse a compañero de escuadrón"
"Radio de consecución"
"%1 m"
"Todo"
"Cualquiera"
"Líder"
Expand All @@ -81,12 +87,20 @@ StringTableRuntime {
"Postura"
"Tumbado"
"De pie"
"%1 m"
"%1 km/h"
"Visibilidad"
"unto de referencia"
"AI"
"Reinforcements"
"Module Type"
"Choose garrison"
"Ambient Mi-8MT Flyby"
"Ambient UH-1H Flyby"
"Height"
"RTB and Despawn"
"Speed"
"Start distance"
"Stay at LZ"
"Vehicle behaviour"
"LZ"
Expand Down
Loading

0 comments on commit 0a50297

Please sign in to comment.