Skip to content

Commit 0a50297

Browse files
KexanoneKexanone
authored
Add ambient flyby modules (#49)
* 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
1 parent b3fcc09 commit 0a50297

35 files changed

+998
-68
lines changed

‎addons/GME/Configs/Core/EditableEntityCore.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ SCR_EditableEntityCore {
1010
}
1111
}
1212
m_EntityLabels {
13+
SCR_EditableEntityCoreLabelSetting "{6207444BA7AD66AD}" {
14+
m_Info SCR_UIInfo "{6207444BD843E277}" {
15+
Name "#GME-Editor_ContentBrowser_Filter_AI_Name"
16+
}
17+
m_LabelType GME_MODULETYPE_AI
18+
m_LabelGroupType GME_MODULETYPE
19+
}
1320
SCR_EditableEntityCoreLabelSetting "{62072CE65FF44D4F}" {
1421
m_Info SCR_UIInfo "{62072CE64AA7F64D}" {
1522
Name "#GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"

‎addons/GME/Configs/Editor/AttributeLists/Edit.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ SCR_EditorAttributeList : "{F3D6C6D25642352C}Configs/Editor/AttributeLists/Edit.
116116
m_CategoryConfig "{A16BBA8270489FA0}Configs/Editor/AttributeCategories/Waypoint.conf"
117117
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
118118
m_baseValues SCR_EditorAttributeBaseValues "{59916BDD3EC05B0B}" {
119-
m_sSliderValueFormating "#GME-Editor_Attribute_CompletionRadius_ValueFormating"
119+
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Length"
120120
m_fMin 0
121121
m_fStep 1
122122
m_iDecimals 0
@@ -157,4 +157,4 @@ SCR_EditorAttributeList : "{F3D6C6D25642352C}Configs/Editor/AttributeLists/Edit.
157157
m_Layout "{9CFE6B0F98097C35}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_MultilineEditBox.layout"
158158
}
159159
}
160-
}
160+
}

‎addons/GME/Configs/Editor/AttributeLists/GME_Modules.conf‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,47 @@
11
SCR_EditorAttributeList {
22
m_aAttributes {
3+
GME_Modules_Attribute_FlybyHeight "{62071A6417B8AC69}" {
4+
m_UIInfo SCR_EditorAttributeUIInfo "{62071BC6AA4E61DF}" {
5+
Name "#GME-Modules_Attribute_Height_Name"
6+
}
7+
m_CategoryConfig "{416C6E9ECC3D231D}Configs/Editor/AttributeCategories/Entity.conf"
8+
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
9+
m_baseValues SCR_EditorAttributeBaseValues "{62071BC68FE0D611}" {
10+
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Length"
11+
m_fMin 10
12+
m_fMax 5000
13+
m_fStep 10
14+
m_iDecimals 0
15+
}
16+
}
17+
GME_Modules_Attribute_FlybySpeed "{62071A641437D257}" {
18+
m_UIInfo SCR_EditorAttributeUIInfo "{62071BC6ABDCFC7A}" {
19+
Name "#GME-Modules_Attribute_Speed_Name"
20+
}
21+
m_CategoryConfig "{416C6E9ECC3D231D}Configs/Editor/AttributeCategories/Entity.conf"
22+
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
23+
m_baseValues SCR_EditorAttributeBaseValues "{62071BC68DE0AF21}" {
24+
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Speed"
25+
m_fMin 50
26+
m_fMax 1000
27+
m_fStep 10
28+
m_iDecimals 0
29+
}
30+
}
31+
GME_Modules_Attribute_FlybyStartDistance "{62071A64154DC719}" {
32+
m_UIInfo SCR_EditorAttributeUIInfo "{62071BC683932DA7}" {
33+
Name "#GME-Modules_Attribute_StartDistance_Name"
34+
}
35+
m_CategoryConfig "{416C6E9ECC3D231D}Configs/Editor/AttributeCategories/Entity.conf"
36+
m_Layout "{680E4985E42137FB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Slider.layout"
37+
m_baseValues SCR_EditorAttributeBaseValues "{62071BC63144EDC4}" {
38+
m_sSliderValueFormating "#GME-Editor_Attribute_ValueFormatting_Length"
39+
m_fMin 1000
40+
m_fMax 10000
41+
m_fStep 100
42+
m_iDecimals 0
43+
}
44+
}
345
GME_Modules_Attribute_SelectLZ "{62057E5007D74B92}" {
446
m_UIInfo SCR_EditorAttributeUIInfo "{62057E5005337FF0}" {
547
Name "#GME-Modules_LZ_name"

‎addons/GME/Configs/Editor/PlaceableEntities/Systems/Systems.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
SCR_PlaceableEntitiesRegistry {
22
m_Prefabs +{
33
"{7B68FEDCB026BB2F}Prefabs/Items/Misc/IntelligenceFolder_E_01/E_GME_IntelFolder_01.et"
4+
"{6CC280CC94A055EA}PrefabsEditable/Modules/Ambient/E_GME_Modules_AmbientUH1HFlyby.et"
5+
"{D7381CF65B75B4D1}PrefabsEditable/Modules/Ambient/E_GME_Modules_AmbientMi8MTFlyby.et"
46
"{B11FA818A134D5AE}PrefabsEditable/Modules/Reinforcements/E_GME_Modules_RallyPoint.et"
57
"{06E1603BE4D59D63}PrefabsEditable/Modules/Reinforcements/E_GME_Modules_LZ.et"
68
"{8A52B1DEF3843C1D}PrefabsEditable/Modules/Reinforcements/E_GME_Modules_SpawnReinforcements.et"

‎addons/GME/Configs/Notifications/Notifications.conf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
SCR_NotificationConfig {
22
m_aNotificationDisplayData {
3-
GME_NotificationPrefabDisplayName "{620508C5276F3855}" {
4-
m_NotificationKey GME_PLACE_PREFAB_FIRST
5-
m_info SCR_UINotificationInfo "{620508C56085F3FC}" {
6-
Name "#GME-Notification_PLACE_PREFAB_FIRST"
7-
Icon "{2ABEFFC36C5EA842}UI/Textures/Notifications/Notification_Default_Failed.edds"
8-
m_cNotificationColor WARNING
9-
}
10-
}
113
SCR_NotificationPlayerTargetEditableEntity "{628CBCCF4C4BA4D1}" {
124
m_NotificationKey GME_PLAYER_PICKED_UP_ITEM
135
m_info SCR_UINotificationInfo "{628CBCCF461F8F6E}" {
@@ -16,5 +8,13 @@ SCR_NotificationConfig {
168
m_EditorSetPositionData AUTO_SET_POSITION_ONCE
179
}
1810
}
11+
GME_NotificationPrefabDisplayName "{620508C5276F3855}" {
12+
m_NotificationKey GME_PLACE_PREFAB_FIRST
13+
m_info SCR_UINotificationInfo "{620508C56085F3FC}" {
14+
Name "#GME-Notification_PLACE_PREFAB_FIRST"
15+
Icon "{2ABEFFC36C5EA842}UI/Textures/Notifications/Notification_Default_Failed.edds"
16+
m_cNotificationColor WARNING
17+
}
18+
}
1919
}
2020
}

‎addons/GME/Language/GME_localization.cs_cz.conf‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ StringTableRuntime {
55
"GME-ActionList_TeleportToSquadmate_Description"
66
"GME-ActionList_TeleportToSquadmate_Name"
77
"GME-Editor_Attribute_CompletionRadius_Name"
8-
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
98
"GME-Editor_Attribute_CompletionType_All_Name"
109
"GME-Editor_Attribute_CompletionType_Any_Name"
1110
"GME-Editor_Attribute_CompletionType_Leader_Name"
@@ -32,12 +31,20 @@ StringTableRuntime {
3231
"GME-Editor_Attribute_Stance_Name"
3332
"GME-Editor_Attribute_Stance_Prone_Name"
3433
"GME-Editor_Attribute_Stance_Stand_Name"
34+
"GME-Editor_Attribute_ValueFormatting_Length"
35+
"GME-Editor_Attribute_ValueFormatting_Speed"
3536
"GME-Editor_Attribute_VisibilityToggle_Name"
3637
"GME-Editor_AttributeCategory_Waypoint_Name"
38+
"GME-Editor_ContentBrowser_Filter_AI_Name"
3739
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
3840
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
3941
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
42+
"GME-Modules_AmbientFlyby_Mi8MT_name"
43+
"GME-Modules_AmbientFlyby_UH1H_name"
44+
"GME-Modules_Attribute_Height_Name"
4045
"GME-Modules_Attribute_RTBAndDespawn_Name"
46+
"GME-Modules_Attribute_Speed_Name"
47+
"GME-Modules_Attribute_StartDistance_Name"
4148
"GME-Modules_Attribute_StayAtLZ_Name"
4249
"GME-Modules_Attribute_VehicleBehavior_Name"
4350
"GME-Modules_LZ_name"
@@ -54,7 +61,6 @@ StringTableRuntime {
5461
"Teleportujte jednotku k jednomu z jejích spolubojovníci"
5562
"Teleportujte se ke spolubojovníci"
5663
"Poloměr dokončení"
57-
"%1 m"
5864
"Všichni"
5965
"Jakýkoliv"
6066
"Velitel"
@@ -81,12 +87,20 @@ StringTableRuntime {
8187
"Postawa"
8288
"Zalehnout"
8389
"Stát"
90+
"%1 m"
91+
"%1 km/h"
8492
"Viditelnost"
8593
"Bod trasy"
94+
"AI"
8695
"Reinforcements"
8796
"Module Type"
8897
"Choose garrison"
98+
"Ambient Mi-8MT Flyby"
99+
"Ambient UH-1H Flyby"
100+
"Height"
89101
"RTB and Despawn"
102+
"Speed"
103+
"Start distance"
90104
"Stay at LZ"
91105
"Vehicle behaviour"
92106
"LZ"

‎addons/GME/Language/GME_localization.de_de.conf‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ StringTableRuntime {
55
"GME-ActionList_TeleportToSquadmate_Description"
66
"GME-ActionList_TeleportToSquadmate_Name"
77
"GME-Editor_Attribute_CompletionRadius_Name"
8-
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
98
"GME-Editor_Attribute_CompletionType_All_Name"
109
"GME-Editor_Attribute_CompletionType_Any_Name"
1110
"GME-Editor_Attribute_CompletionType_Leader_Name"
@@ -32,12 +31,20 @@ StringTableRuntime {
3231
"GME-Editor_Attribute_Stance_Name"
3332
"GME-Editor_Attribute_Stance_Prone_Name"
3433
"GME-Editor_Attribute_Stance_Stand_Name"
34+
"GME-Editor_Attribute_ValueFormatting_Length"
35+
"GME-Editor_Attribute_ValueFormatting_Speed"
3536
"GME-Editor_Attribute_VisibilityToggle_Name"
3637
"GME-Editor_AttributeCategory_Waypoint_Name"
38+
"GME-Editor_ContentBrowser_Filter_AI_Name"
3739
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
3840
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
3941
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
42+
"GME-Modules_AmbientFlyby_Mi8MT_name"
43+
"GME-Modules_AmbientFlyby_UH1H_name"
44+
"GME-Modules_Attribute_Height_Name"
4045
"GME-Modules_Attribute_RTBAndDespawn_Name"
46+
"GME-Modules_Attribute_Speed_Name"
47+
"GME-Modules_Attribute_StartDistance_Name"
4148
"GME-Modules_Attribute_StayAtLZ_Name"
4249
"GME-Modules_Attribute_VehicleBehavior_Name"
4350
"GME-Modules_LZ_name"
@@ -54,7 +61,6 @@ StringTableRuntime {
5461
"Teleportiere die Einheit zu einem seiner Kameraden"
5562
"Zum Kameraden teleportieren"
5663
"Abschlussradius"
57-
"%1 m"
5864
"Alle"
5965
"Irgendeiner"
6066
"Anführer"
@@ -81,12 +87,20 @@ StringTableRuntime {
8187
"Haltung"
8288
"Hinlegen"
8389
"Aufstehen"
90+
"%1 m"
91+
"%1 km/h"
8492
"Sichtbarkeit"
8593
"Wegpunkt"
94+
"KI"
8695
"Verstärkungen"
8796
"Modultyp"
8897
"Besatzung auswählen"
98+
"Atmosphärischer Vorbeiflug eines Mi-9MT"
99+
"Atmosphärischer Vorbeiflug eines UH-1H"
100+
"Höhe"
89101
"Zurück und Löschen"
102+
"Tempo"
103+
"Startdistanz"
90104
"Bei LZ verbleiben"
91105
"Fahrzeugverhalten"
92106
"LZ"

‎addons/GME/Language/GME_localization.en_us.conf‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ StringTableRuntime {
55
"GME-ActionList_TeleportToSquadmate_Description"
66
"GME-ActionList_TeleportToSquadmate_Name"
77
"GME-Editor_Attribute_CompletionRadius_Name"
8-
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
98
"GME-Editor_Attribute_CompletionType_All_Name"
109
"GME-Editor_Attribute_CompletionType_Any_Name"
1110
"GME-Editor_Attribute_CompletionType_Leader_Name"
@@ -32,12 +31,20 @@ StringTableRuntime {
3231
"GME-Editor_Attribute_Stance_Name"
3332
"GME-Editor_Attribute_Stance_Prone_Name"
3433
"GME-Editor_Attribute_Stance_Stand_Name"
34+
"GME-Editor_Attribute_ValueFormatting_Length"
35+
"GME-Editor_Attribute_ValueFormatting_Speed"
3536
"GME-Editor_Attribute_VisibilityToggle_Name"
3637
"GME-Editor_AttributeCategory_Waypoint_Name"
38+
"GME-Editor_ContentBrowser_Filter_AI_Name"
3739
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
3840
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
3941
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
42+
"GME-Modules_AmbientFlyby_Mi8MT_name"
43+
"GME-Modules_AmbientFlyby_UH1H_name"
44+
"GME-Modules_Attribute_Height_Name"
4045
"GME-Modules_Attribute_RTBAndDespawn_Name"
46+
"GME-Modules_Attribute_Speed_Name"
47+
"GME-Modules_Attribute_StartDistance_Name"
4148
"GME-Modules_Attribute_StayAtLZ_Name"
4249
"GME-Modules_Attribute_VehicleBehavior_Name"
4350
"GME-Modules_LZ_name"
@@ -54,7 +61,6 @@ StringTableRuntime {
5461
"Teleport unit to one of its squadmates"
5562
"Teleport To Squadmate"
5663
"Completion radius"
57-
"%1 m"
5864
"All"
5965
"Any"
6066
"Leader"
@@ -81,12 +87,20 @@ StringTableRuntime {
8187
"Stance"
8288
"Prone"
8389
"Stand"
90+
"%1 m"
91+
"%1 km/h"
8492
"Visibility"
8593
"Waypoint"
94+
"AI"
8695
"Reinforcements"
8796
"Module Type"
8897
"Choose garrison"
98+
"Ambient Mi-8MT Flyby"
99+
"Ambient UH-1H Flyby"
100+
"Height"
89101
"RTB and Despawn"
102+
"Speed"
103+
"Start distance"
90104
"Stay at LZ"
91105
"Vehicle behaviour"
92106
"LZ"

‎addons/GME/Language/GME_localization.es_es.conf‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ StringTableRuntime {
55
"GME-ActionList_TeleportToSquadmate_Description"
66
"GME-ActionList_TeleportToSquadmate_Name"
77
"GME-Editor_Attribute_CompletionRadius_Name"
8-
"GME-Editor_Attribute_CompletionRadius_ValueFormating"
98
"GME-Editor_Attribute_CompletionType_All_Name"
109
"GME-Editor_Attribute_CompletionType_Any_Name"
1110
"GME-Editor_Attribute_CompletionType_Leader_Name"
@@ -32,12 +31,20 @@ StringTableRuntime {
3231
"GME-Editor_Attribute_Stance_Name"
3332
"GME-Editor_Attribute_Stance_Prone_Name"
3433
"GME-Editor_Attribute_Stance_Stand_Name"
34+
"GME-Editor_Attribute_ValueFormatting_Length"
35+
"GME-Editor_Attribute_ValueFormatting_Speed"
3536
"GME-Editor_Attribute_VisibilityToggle_Name"
3637
"GME-Editor_AttributeCategory_Waypoint_Name"
38+
"GME-Editor_ContentBrowser_Filter_AI_Name"
3739
"GME-Editor_ContentBrowser_Filter_REINFORCEMENTS_Name"
3840
"GME-Editor_ContentBrowser_FilterCategory_MODULETYPE_Name"
3941
"GME-Editor_ContentBrowser_Title_ChooseGarrison"
42+
"GME-Modules_AmbientFlyby_Mi8MT_name"
43+
"GME-Modules_AmbientFlyby_UH1H_name"
44+
"GME-Modules_Attribute_Height_Name"
4045
"GME-Modules_Attribute_RTBAndDespawn_Name"
46+
"GME-Modules_Attribute_Speed_Name"
47+
"GME-Modules_Attribute_StartDistance_Name"
4148
"GME-Modules_Attribute_StayAtLZ_Name"
4249
"GME-Modules_Attribute_VehicleBehavior_Name"
4350
"GME-Modules_LZ_name"
@@ -54,7 +61,6 @@ StringTableRuntime {
5461
"Unidad de teletransporte a uno de sus compañeros de escuadrón"
5562
"Teletransportarse a compañero de escuadrón"
5663
"Radio de consecución"
57-
"%1 m"
5864
"Todo"
5965
"Cualquiera"
6066
"Líder"
@@ -81,12 +87,20 @@ StringTableRuntime {
8187
"Postura"
8288
"Tumbado"
8389
"De pie"
90+
"%1 m"
91+
"%1 km/h"
8492
"Visibilidad"
8593
"unto de referencia"
94+
"AI"
8695
"Reinforcements"
8796
"Module Type"
8897
"Choose garrison"
98+
"Ambient Mi-8MT Flyby"
99+
"Ambient UH-1H Flyby"
100+
"Height"
89101
"RTB and Despawn"
102+
"Speed"
103+
"Start distance"
90104
"Stay at LZ"
91105
"Vehicle behaviour"
92106
"LZ"

0 commit comments

Comments
 (0)