Merge branch 'release/1.0.5'

zen-mod · Aug 13, 2023 · 65fc222 · 65fc222
2 parents 052f53e + 42ad23a
commit 65fc222
Show file tree

Hide file tree

Showing 50 changed files with 113,464 additions and 324 deletions.
diff --git a/Configs/Editor/ActionLists/Context/TempEdit.conf b/Configs/Editor/ActionLists/Context/TempEdit.conf
@@ -0,0 +1,14 @@
+SCR_EditorActionList {
+ m_Actions {
+  ODIN_TeleportToSquadmateContextAction "{5DB755396BAD8347}" {
+   m_Info SCR_UIInfo "{5DB755397F2426B9}" {
+    Name "#ODIN-ActionList_TeleportToSquadmate_Name"
+    Description "#ODIN-ActionList_TeleportToSquadmate_Description"
+    Icon "{F0E0F66182733D39}UI/Textures/Editor/ContextMenu/ContextAction_Teleport_Player.edds"
+   }
+   m_iOrder 200
+   m_bEnableShortcutLogics 0
+   m_bShowOnCooldownNotification 0
+  }
+ }
+}
diff --git a/Configs/Editor/ActionLists/Context/TempEdit.conf.meta b/Configs/Editor/ActionLists/Context/TempEdit.conf.meta
@@ -0,0 +1,15 @@
+MetaFileClass {
+ Name "{2C1D87DE93C77A27}Configs/Editor/ActionLists/Context/TempEdit.conf"
+ Configurations {
+  CONFResourceClass PC {
+  }
+  CONFResourceClass XBOX_ONE : PC {
+  }
+  CONFResourceClass XBOX_SERIES : PC {
+  }
+  CONFResourceClass PS4 : PC {
+  }
+  CONFResourceClass HEADLESS : PC {
+  }
+ }
+}
diff --git a/Configs/Editor/AttributeLists/Edit.conf b/Configs/Editor/AttributeLists/Edit.conf
@@ -8,6 +8,35 @@ SCR_EditorAttributeList {
    m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
    m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
   }
+  ODIN_ToggleDamageVehicleAttribute "{5DB0F3FD83111076}" {
+   m_UIInfo SCR_EditorAttributeUIInfo "{5DB0F3FD8108C6AB}" {
+    Name "#ODIN-Editor_Attribute_EnableDamage_Name"
+   }
+   m_CategoryConfig "{7FA3F309CBFCDACF}Configs/Editor/AttributeCategories/Vehicle.conf"
+   m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
+  }
+  ODIN_ToggleVisibilityEditorAttribute "{5D955C21A940FB32}" {
+   m_UIInfo SCR_EditorAttributeUIInfo "{5D955C21B533D246}" {
+    Name "#ODIN-Editor_Attribute_VisibilityToggle_Name"
+   }
+   m_CategoryConfig "{8A757725BEAC5B36}Configs/Editor/AttributeCategories/Character.conf"
+   m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
+   m_aWhiteListEntityTypes {
+    2
+   }
+   m_aBlackListEntityTypes {
+   }
+  }
+  ODIN_ToggleVisibilityVehicleEditorAttribute "{5D9D720ACEF81609}" {
+   m_UIInfo SCR_EditorAttributeUIInfo "{5D9D720AD345FC3C}" {
+    Name "#ODIN-Editor_Attribute_VisibilityToggle_Name"
+   }
+   m_CategoryConfig "{7FA3F309CBFCDACF}Configs/Editor/AttributeCategories/Vehicle.conf"
+   m_Layout "{D0F3CE0C63A5AEBB}UI/layouts/Editor/Attributes/AttributePrefabs/AttributePrefab_Checkbox.layout"
+   m_aWhiteListEntityTypes {
+    3
+   }
+  }
   ODIN_SkillEditorAttribute "{597D1A3551570E9A}" {
    m_UIInfo SCR_EditorAttributeUIInfo "{597D1A355FEEF7AE}" {
     Name "#ODIN-Editor_Attribute_Skill_Name"

diff --git a/Configs/Editor/PlaceableEntities/Systems/Systems.conf b/Configs/Editor/PlaceableEntities/Systems/Systems.conf
@@ -0,0 +1,6 @@
+SCR_PlaceableEntitiesRegistry {
+ m_Prefabs +{
+  "{32044DD6C2ABD643}PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et"
+  "{ED80D725A6D4D08D}PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_TM62M.et"
+ }
+}
diff --git a/Configs/Editor/PlaceableEntities/Systems/Systems.conf.meta b/Configs/Editor/PlaceableEntities/Systems/Systems.conf.meta
@@ -0,0 +1,15 @@
+MetaFileClass {
+ Name "{3A9124B8692C3F39}Configs/Editor/PlaceableEntities/Systems/Systems.conf"
+ Configurations {
+  CONFResourceClass PC {
+  }
+  CONFResourceClass XBOX_ONE : PC {
+  }
+  CONFResourceClass XBOX_SERIES : PC {
+  }
+  CONFResourceClass PS4 : PC {
+  }
+  CONFResourceClass HEADLESS : PC {
+  }
+ }
+}
diff --git a/Configs/System/chimeraMenus.conf b/Configs/System/chimeraMenus.conf
@@ -0,0 +1,8 @@
+MenuManager {
+ MenuPresets {
+  MenuPreset ODIN_Listbox_SingleSelect_ID {
+   Layout "{73A9C9284FFE3376}UI/layouts/ODIN_ListBox_SingleSelect.layout"
+   Class "ODIN_ListboxSingleSelectDialog"
+  }
+ }
+}
diff --git a/Configs/System/chimeraMenus.conf.meta b/Configs/System/chimeraMenus.conf.meta
@@ -0,0 +1,15 @@
+MetaFileClass {
+ Name "{C747AFB6B750CE9A}Configs/System/chimeraMenus.conf"
+ Configurations {
+  CONFResourceClass PC {
+  }
+  CONFResourceClass XBOX_ONE : PC {
+  }
+  CONFResourceClass XBOX_SERIES : PC {
+  }
+  CONFResourceClass PS4 : PC {
+  }
+  CONFResourceClass HEADLESS : PC {
+  }
+ }
+}
diff --git a/Language/OdinZeus_localization.st.st → Language/OdinZeus_localization.st b/Language/OdinZeus_localization.st.st → Language/OdinZeus_localization.st
@@ -1,6 +1,40 @@
 StringTable {
  ItemClassName "CustomStringTableItem"
  Items {
+  CustomStringTableItem "{5DC552DCD58C02A3}" {
+   Id "ODIN-ActionList_TeleportToSquadmate_Description"
+   Target_en_us "Teleport unit to one of its squadmates"
+   Target_fr_fr "Téléporter l'unité à l'un de ses coéquipiers"
+   Target_it_it "Teletrasporta l'unità a uno dei suoi compagni di squadra"
+   Target_de_de "Teleportiere die Einheit zu einem seiner Kameraden"
+   Target_es_es "Unidad de teletransporte a uno de sus compañeros de escuadrón"
+   Target_cs_cz "Teleportujte jednotku k jednomu z jejích spolubojovníci"
+   Target_pl_pl "Teleportuj jednostkę do jednego z członków jej drużyny"
+   Target_ru_ru "Телепортировать юнит к одному из его товарищей по отряду"
+   Target_ja_jp "ユニットを分隊メンバーの一人にテレポートする"
+   Target_ko_kr "유닛을 분대원 중 한 명에게 텔레포트합니다."
+   Target_zh_cn "将单位传送至其一名队员处"
+   Modified 1575019898
+   Author "crow"
+   LastChanged "kexanone"
+  }
+  CustomStringTableItem "{5DC552DCFF58F14E}" {
+   Id "ODIN-ActionList_TeleportToSquadmate_Name"
+   Target_en_us "Teleport To Squadmate"
+   Target_fr_fr "Téléportation vers un coéquipier"
+   Target_it_it "Teletrasporta al compagno di squadra"
+   Target_de_de "Zum Kameraden teleportieren"
+   Target_es_es "Teletransportarse a compañero de escuadrón"
+   Target_cs_cz "Teleportujte se ke spolubojovníci"
+   Target_pl_pl "Teleportuj się do członka drużyny"
+   Target_ru_ru "Телепортироваться к товарищу по отряду"
+   Target_ja_jp "分隊へテレポート"
+   Target_ko_kr "분대원에게 텔레포트"
+   Target_zh_cn "传送至队友"
+   Modified 1575019335
+   Author "crow"
+   LastChanged "kexanone"
+  }
   CustomStringTableItem "{5D19597480C39F02}" {
    Id "ODIN-EditableEntity_AIWaypoint_Cycle_Name"
    Target_en_us "CYCLE"
@@ -523,6 +557,24 @@ StringTable {
    ImageLink ""
    Hidden 0
   }
+  CustomStringTableItem "{5D955C2079184639}" {
+   Id "ODIN-Editor_Attribute_VisibilityToggle_Name"
+   Target_en_us "Visibility"
+   Target_fr_fr "Visibilité"
+   Target_it_it "Visibilità"
+   Target_de_de "Sichtbarkeit"
+   Target_es_es "Visibilidad"
+   Target_cs_cz "Viditelnost"
+   Target_pl_pl "Widoczność"
+   Target_ru_ru "Видимость"
+   Target_ja_jp "可視性"
+   Target_ko_kr "가시거리"
+   Target_pt_br "Visibilidade"
+   Target_zh_cn "可見度"
+   Modified 1575018999
+   Author "crow"
+   LastChanged "kexanone"
+  }
   CustomStringTableItem "{5D19597480C380D1}" {
    Id "ODIN-Editor_AttributeCategory_Waypoint_Name"
    Target_en_us "Waypoint"
@@ -552,5 +604,41 @@ StringTable {
    ImageLink ""
    Hidden 0
   }
+  CustomStringTableItem "{5DC552DA2913D62A}" {
+   Id "ODIN-UI_Listbox_OnCancel"
+   Target_en_us "Cancel"
+   Target_fr_fr "Annuler"
+   Target_it_it "Annulla"
+   Target_de_de "Abbrechen"
+   Target_es_es "Cancelar"
+   Target_cs_cz "Zrušit"
+   Target_pl_pl "Anuluj"
+   Target_ru_ru "Отмена"
+   Target_ja_jp "キャンセル"
+   Target_ko_kr "취소"
+   Target_pt_br "Cancelar"
+   Target_zh_cn "取消"
+   Modified 1575018579
+   Author "crow"
+   LastChanged "kexanone"
+  }
+  CustomStringTableItem "{5DC552DA2D2CBC68}" {
+   Id "ODIN-UI_Listbox_OnConfirm"
+   Target_en_us "Confirm"
+   Target_fr_fr "Confirmer"
+   Target_it_it "Confermar"
+   Target_de_de "Bestätigen"
+   Target_es_es "Confirmar"
+   Target_cs_cz "Potvrdit"
+   Target_pl_pl "Potwierdź"
+   Target_ru_ru "Подтвердить"
+   Target_ja_jp "確定"
+   Target_ko_kr "확인"
+   Target_pt_br "Confirmar"
+   Target_zh_cn "確認"
+   Modified 1575018908
+   Author "crow"
+   LastChanged "kexanone"
+  }
  }
 }
diff --git a/Language/OdinZeus_localization.st.st.meta → Language/OdinZeus_localization.st.meta b/Language/OdinZeus_localization.st.st.meta → Language/OdinZeus_localization.st.meta
diff --git a/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et b/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et
@@ -0,0 +1,33 @@
+GenericEntity : "{49FFE8F373F55960}Prefabs/Weapons/Explosives/Mine_M15AT/Mine_M15AT.et" {
+ ID "5968D2B6A82C6019"
+ components {
+  BaseTriggerComponent "{59E4E69D8E9B4323}" {
+  }
+  SCR_EditableSystemComponent "{5D9202CFB416EBCC}" {
+   m_EntityType SYSTEM
+   m_UIInfo SCR_EditableEntityUIInfo "{5D9202CFB1485B6F}" {
+    Name "#AR-Weapon_M15_Name"
+    Description "#AR-Weapon_M15_Description"
+    Icon "{1FBE76E25DDFB65C}UI/Textures/Editor/EditableEntities/Systems/EditableEntity_System_ZoneRestriction.edds"
+    m_Image "{CD6EDD2DB7E02594}UI/Textures/EditorPreviews/Weapons/Explosives/ODIN_E_Mine_M15AT.edds"
+    m_sFaction "US"
+    m_aAuthoredLabels {
+     38
+    }
+    m_aAutoLabels {
+     11 7 120
+    }
+    m_EntityBudgetCost {
+     SCR_EntityBudgetValue "{5D9202CFCE4653FF}" {
+      m_BudgetType SYSTEMS
+      m_Value 4
+     }
+    }
+   }
+   m_bAutoRegister ALWAYS
+  }
+  SCR_PressureTriggerComponent "{59E6BE151DCC9953}" {
+   m_bLive 1
+  }
+ }
+}
diff --git a/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et.meta b/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_M15AT.et.meta
@@ -0,0 +1,15 @@
+MetaFileClass {
+ Name "{32044DD6C2ABD643}Prefabs/Weapons/Explosives/Mine_M15AT/ODIN_E_Mine_M15AT.et"
+ Configurations {
+  EntityTemplateResourceClass PC {
+  }
+  EntityTemplateResourceClass XBOX_ONE : PC {
+  }
+  EntityTemplateResourceClass XBOX_SERIES : PC {
+  }
+  EntityTemplateResourceClass PS4 : PC {
+  }
+  EntityTemplateResourceClass HEADLESS : PC {
+  }
+ }
+}
diff --git a/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_TM62M.et b/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_TM62M.et
@@ -0,0 +1,33 @@
+GenericEntity : "{D6EF54367CECE1D9}Prefabs/Weapons/Explosives/Mine_TM62M/Mine_TM62M.et" {
+ ID "59EC9890DE0228CB"
+ components {
+  BaseTriggerComponent "{59E4E69D8E9B4323}" {
+  }
+  SCR_EditableSystemComponent "{5D9202CCB9459B7A}" {
+   m_EntityType SYSTEM
+   m_UIInfo SCR_EditableEntityUIInfo "{5D9202CCEF09E110}" {
+    Name "#AR-Weapon_TM62M_Name"
+    Description "#AR-Weapon_TM62M_Description"
+    Icon "{1FBE76E25DDFB65C}UI/Textures/Editor/EditableEntities/Systems/EditableEntity_System_ZoneRestriction.edds"
+    m_Image "{D80F859993FA99FA}UI/Textures/EditorPreviews/Weapons/Explosives/ODIN_E_Mine_TM62M.edds"
+    m_sFaction "USSR"
+    m_aAuthoredLabels {
+     38
+    }
+    m_aAutoLabels {
+     10 7 120
+    }
+    m_EntityBudgetCost {
+     SCR_EntityBudgetValue "{5D9202CC4A948255}" {
+      m_BudgetType SYSTEMS
+      m_Value 4
+     }
+    }
+   }
+   m_bAutoRegister ALWAYS
+  }
+  SCR_PressureTriggerComponent "{59E6BE151DCC9953}" {
+   m_bLive 1
+  }
+ }
+}
diff --git a/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_TM62M.et.meta b/PrefabsEditable/Weapons/Explosives/ODIN_E_Mine_TM62M.et.meta
@@ -0,0 +1,15 @@
+MetaFileClass {
+ Name "{ED80D725A6D4D08D}Prefabs/Weapons/Explosives/Mine_TM62M/ODIN_E_Mine_TM62M.et"
+ Configurations {
+  EntityTemplateResourceClass PC {
+  }
+  EntityTemplateResourceClass XBOX_ONE : PC {
+  }
+  EntityTemplateResourceClass XBOX_SERIES : PC {
+  }
+  EntityTemplateResourceClass PS4 : PC {
+  }
+  EntityTemplateResourceClass HEADLESS : PC {
+  }
+ }
+}
diff --git a/Scripts/Game/ODIN/AI/Components/SCR_AICombatComponent.c b/Scripts/Game/ODIN/AI/Components/SCR_AICombatComponent.c
@@ -0,0 +1,18 @@
+
+
+modded class SCR_AICombatComponent : ScriptComponent
+{
+	override bool SelectTarget(BaseTarget newTarget)
+	{
+		// gotta do null check as otherwise we crash, as when there is no targets at spawn, NewTarget is null. So we just call super and call it a day
+		if (!newTarget)
+			return super.SelectTarget(newTarget);
+
+		// get visibility, if not visible AI can't change to that target, otherwise up to super
+		bool visible = ODIN_VisibilityHelper.GetVisibility(newTarget.GetTargetEntity());
+		if (!visible)
+			return false;
+		else
+			return super.SelectTarget(newTarget);
+	}
+};