Skip to content

Core - Fix exit stance and ragdoll for helper animation compartments #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kexanone wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Core - Fix exit stance and ragdoll for helper animation compartments #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06a782e
Fix helper compartment slot and exit stance
Kexanone Dec 7, 2025
5f15ea3
Eject and send into ragdoll from helper compartment when not alive
Kexanone Dec 7, 2025
41b8a7f
Send dragged into prone stance on exit
Kexanone Dec 7, 2025
9e7a3e0
Update terminate usage in captives
Kexanone Dec 7, 2025
66a876e
Remove depreacated attribute
Kexanone Dec 7, 2025
9c127f8
Always radgoll on termination of carrying and dragging
Kexanone Dec 7, 2025
7daed04
Remove position search when ejecting
Kexanone Dec 7, 2025
eaf134d
Remove exit stances, as we force ragdoll instead
Kexanone Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addons/captives/Prefabs/Helpers/ACE_Captives_SurrenderHelperCompartment.et
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ ACE_Captives_SurrenderHelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE
}
}
}
m_eLifeStateChangedGetOutType TELEPORT
}
1 change: 0 additions & 1 deletion addons/captives/Prefabs/Helpers/ACE_Captives_TiedHelperCompartment.et
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ ACE_Captives_TiedHelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE_Anim
}
}
}
m_eLifeStateChangedGetOutType TELEPORT
}
2 changes: 1 addition & 1 deletion ...aptives/Editor/Containers/Actions/ContextActions/ACE_Captives_ToggleEntityContextAction.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ACE_Captives_ToggleEntityContextAction : SCR_SelectedEntitiesContextAction

ACE_AnimationHelperCompartment helper = ACE_AnimationHelperCompartment.Cast(char.GetParent());
if (helper && m_eAnimationHelperID)
helper.Terminate(EGetOutType.ANIMATED);
helper.Terminate();
else
ACE_AnimationTools.AnimateWithHelperCompartment(m_eAnimationHelperID, char);
}
Expand Down
13 changes: 4 additions & 9 deletions addons/carrying/Prefabs/Helpers/ACE_Carrying_BaseHelperCompartment.et
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,10 @@ ACE_Carrying_HelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE_Animatio
}
SCR_BaseCompartmentManagerComponent "{2CD4A765A7D52986}" {
CompartmentSlots {
CargoCompartmentSlot Carried {
PassengerPositionInfo EntitySlotInfo s1 {
Offset -0.1 -0.6 0.05
CargoCompartmentSlot Performer {
OverrideEntryPositionInfo PointInfo "{670E0D3DB86D5304}" {
}
ForcedFreeLook 1
SeatType 1
OverrideEntryPositionInfo PointInfo "{61D2CA8A14132241}" {
}
OverrideExitPositionInfo PointInfo "{61D2CA8A18570AAB}" {
OverrideExitPositionInfo PointInfo "{670E0D3DB3C80C6C}" {
}
}
}
Expand All @@ -35,5 +30,5 @@ ACE_Carrying_HelperCompartment : "{0D226790BE615DC7}Prefabs/Helpers/ACE_Animatio
}
}
}
m_eID NONE
m_bForceRagdollOnTermination 1
}
1 change: 0 additions & 1 deletion addons/carrying/Prefabs/Helpers/ACE_Carrying_CarriedHelperCompartment.et
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ ACE_Carrying_HelperCompartment : "{FF78613C1DAFF28F}Prefabs/Helpers/ACE_Carrying
}
}
}
m_eID CARRIED
}
1 change: 0 additions & 1 deletion addons/carrying/Prefabs/Helpers/ACE_Carrying_DraggedHelperCompartment.et
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ ACE_Carrying_HelperCompartment : "{FF78613C1DAFF28F}Prefabs/Helpers/ACE_Carrying
}
}
}
m_eID DRAGGED
}
2 changes: 1 addition & 1 deletion addons/core/scripts/Game/ACE_Core/Components/ACE_CarriableAnimationHelperComponent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ACE_CarriableAnimationHelperComponent : ACE_CarriableEntityComponent
charCtrl.ACE_SetCarrier(null);

if (m_bTerminateWhenReleased && !m_bHasParentTerminated)
m_pOwner.Terminate(EGetOutType.ANIMATED);
m_pOwner.Terminate();
}

//------------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions addons/core/scripts/Game/ACE_Core/Global/ACE_AnimationHelper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ class ACE_AnimationTools
}

//------------------------------------------------------------------------------------------------
static void TerminateHelperCompartment(notnull IEntity performer, EGetOutType getOutType = EGetOutType.ANIMATED)
static void TerminateHelperCompartment(notnull IEntity performer)
{
ACE_AnimationHelperCompartment helper = GetHelperCompartment(performer);
if (helper)
helper.Terminate(getOutType);
helper.Terminate();
}
}
17 changes: 7 additions & 10 deletions addons/core/scripts/Game/ACE_Core/Helpers/ACE_AnimationHelperCompartment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ class ACE_AnimationHelperCompartmentClass : GenericEntityClass
//! --- To Do: Create derived classes of this for carrying and CPR
class ACE_AnimationHelperCompartment : GenericEntity
{
[Attribute(defvalue: "ANIMATED", uiwidget: UIWidgets.SearchComboBox, desc: "Get out type when life state has changed", enums: ParamEnumArray.FromEnum(EGetOutType))]
protected EGetOutType m_eLifeStateChangedGetOutType;
[Attribute(defvalue: "false", desc: "Whether performer should always enter ragdoll when terminating the helper compartment")]
protected bool m_bForceRagdollOnTermination;

[RplProp(onRplName: "OnPerformerChanged")]
protected RplId m_iPerformerID;
Expand Down Expand Up @@ -84,11 +84,11 @@ class ACE_AnimationHelperCompartment : GenericEntity

//------------------------------------------------------------------------------------------------
//! Terminates animation
void Terminate(EGetOutType getOutType = EGetOutType.ANIMATED)
void Terminate()
{
// Reschedule termination when init is not yet done, for instance, when called before the character is moving in
if (!m_bInitDone)
GetGame().GetCallqueue().CallLater(Terminate, 100, false, getOutType);
GetGame().GetCallqueue().CallLater(Terminate, 100);

if (!m_pPerformer)
{
Expand All @@ -103,7 +103,7 @@ class ACE_AnimationHelperCompartment : GenericEntity
return;
}

if (getOutType == EGetOutType.ANIMATED)
if (!m_bForceRagdollOnTermination && m_pPerformer.GetCharacterController().GetLifeState() == ECharacterLifeState.ALIVE)
compartmentAccess.ACE_GetOutVehicle(EGetOutType.ANIMATED, -1, ECloseDoorAfterActions.INVALID, false);
else
EjectPerformer();
Expand All @@ -122,10 +122,7 @@ class ACE_AnimationHelperCompartment : GenericEntity

vector transform[4];
GetWorldTransform(transform);
vector pos;
SCR_WorldTools.FindEmptyTerrainPosition(pos, transform[3], SEARCH_POS_RADIUS_M);
transform[3] = pos;
compartmentAccess.ACE_MoveOutVehicle(transform);
compartmentAccess.ACE_MoveOutVehicle(transform, true);

// Broadcast teleport on network
RplComponent performerRpl = RplComponent.Cast(m_pPerformer.FindComponent(RplComponent));
Expand All @@ -150,7 +147,7 @@ class ACE_AnimationHelperCompartment : GenericEntity
//! Terminate when performer gets incapacitated or dies
protected void OnPerformerLifeStateChanged(ECharacterLifeState previousLifeState, ECharacterLifeState newLifeState)
{
Terminate(m_eLifeStateChangedGetOutType);
Terminate();
}

//------------------------------------------------------------------------------------------------
Expand Down