Skip to content
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

Carrying - Add Place casualty #57

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

Carrying - Add Place casualty #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b7bbdb0
Add "Place carried" action to Cots
veteran29 Apr 26, 2024
6974658
Fix patient placement, shorten action time
veteran29 Apr 27, 2024
2b6e601
Move prefab edits to Carrying addon
veteran29 Apr 27, 2024
178e328
Add place casualty translation
veteran29 Apr 27, 2024
8586d0b
Regenerate runtime translations
veteran29 Apr 27, 2024
7705725
Move hooking of OnCompartmentLeft to Helper.Init
veteran29 Apr 27, 2024
e39aa76
Add StrecherHelperCompartment
veteran29 Apr 27, 2024
f2b3b35
Place unit via comparment
veteran29 Apr 27, 2024
d46a727
Add death anim to strecher animset
veteran29 Apr 27, 2024
4db6c3b
Fix strecher prefab name
veteran29 Apr 27, 2024
df55ac1
Add guard check to OnCompartmentLeft
veteran29 Apr 27, 2024
ced85f1
Update placement offsets
veteran29 Apr 27, 2024
80a4e7c
Refactor strecher handling into child entity class
veteran29 Apr 27, 2024
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
2 changes: 1 addition & 1 deletion addons/carrying/Assets/Vehicles/Wheeled/workspaces/Player_CarryInjured.asi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AnimSetInstanceSource {
AnimSetInstanceSource "{613764EA923CF6C4}" {
Template "{7F633C1C12A72901}Assets/Vehicles/Wheeled/workspaces/Vehicles_Wheeled_Template.ast"
Lines {
AnimSetInstanceSource_Line "Vehicle.CoDriver.Idle" {
Expand Down
97 changes: 97 additions & 0 deletions addons/carrying/Assets/Vehicles/Wheeled/workspaces/Player_StrecherInjured.asi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
AnimSetInstanceSource "{6136A0C37DBB6595}" {
Template "{7F633C1C12A72901}Assets/Vehicles/Wheeled/workspaces/Vehicles_Wheeled_Template.ast"
Lines {
AnimSetInstanceSource_Line "Vehicle.CoDriver.Idle" {
Resource "{C86BDABCDBE56196}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.Driver.Idle" {
Resource "{C86BDABCDBE56196}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.Gunner.Idle" {
Resource "{C86BDABCDBE56196}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerL.Idle" {
Resource "{C86BDABCDBE56196}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerR.Idle" {
Resource "{C86BDABCDBE56196}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.UniqueSeat.Idle" {
Resource "{C86BDABCDBE56196}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.CoDriver.UnconsciousIdle" {
Resource "{13DFE41BA3B966C9}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.Driver.UnconsciousIdle" {
Resource "{13DFE41BA3B966C9}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.Gunner.UnconsciousIdle" {
Resource "{13DFE41BA3B966C9}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerL.UnconsciousIdle" {
Resource "{13DFE41BA3B966C9}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerR.UnconsciousIdle" {
Resource "{13DFE41BA3B966C9}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.UniqueSeat.UnconsciousIdle" {
Resource "{13DFE41BA3B966C9}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_loop.anm"
}
AnimSetInstanceSource_Line "Vehicle.CoDriver.UnconsciousIn" {
Resource "{74B1CC58CFA02178}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_in.anm"
}
AnimSetInstanceSource_Line "Vehicle.Driver.UnconsciousIn" {
Resource "{74B1CC58CFA02178}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_in.anm"
}
AnimSetInstanceSource_Line "Vehicle.Gunner.UnconsciousIn" {
Resource "{74B1CC58CFA02178}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_in.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerL.UnconsciousIn" {
Resource "{74B1CC58CFA02178}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_in.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerR.UnconsciousIn" {
Resource "{74B1CC58CFA02178}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_in.anm"
}
AnimSetInstanceSource_Line "Vehicle.UniqueSeat.UnconsciousIn" {
Resource "{74B1CC58CFA02178}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_in.anm"
}
AnimSetInstanceSource_Line "Vehicle.CoDriver.UnconsciousOut" {
Resource "{0CEDDDC58B74041F}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_out.anm"
}
AnimSetInstanceSource_Line "Vehicle.Driver.UnconsciousOut" {
Resource "{0CEDDDC58B74041F}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_out.anm"
}
AnimSetInstanceSource_Line "Vehicle.Gunner.UnconsciousOut" {
Resource "{0CEDDDC58B74041F}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_out.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerL.UnconsciousOut" {
Resource "{0CEDDDC58B74041F}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_out.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerR.UnconsciousOut" {
Resource "{0CEDDDC58B74041F}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_out.anm"
}
AnimSetInstanceSource_Line "Vehicle.UniqueSeat.UnconsciousOut" {
Resource "{0CEDDDC58B74041F}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_unconscious_out.anm"
}
AnimSetInstanceSource_Line "Vehicle.CoDriver.Death" {
Resource "{2A948FDF4AD9B65E}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_death_idle.anm"
}
AnimSetInstanceSource_Line "Vehicle.Driver.Death" {
Resource "{2A948FDF4AD9B65E}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_death_idle.anm"
}
AnimSetInstanceSource_Line "Vehicle.Gunner.Death" {
Resource "{2A948FDF4AD9B65E}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_death_idle.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerL.Death" {
Resource "{2A948FDF4AD9B65E}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_death_idle.anm"
}
AnimSetInstanceSource_Line "Vehicle.PassengerR.Death" {
Resource "{2A948FDF4AD9B65E}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_death_idle.anm"
}
AnimSetInstanceSource_Line "Vehicle.UniqueSeat.Death" {
Resource "{2A948FDF4AD9B65E}anims/anm/player/vehicles/Ambulances/anm/p_ambulance_patient_death_idle.anm"
}
}
RBF AnimSetInstanceSourceRBFArray "{5DC3656B0EF64C8C}" {
}
}
17 changes: 17 additions & 0 deletions addons/carrying/Assets/Vehicles/Wheeled/workspaces/Player_StrecherInjured.asi.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
MetaFileClass {
Name "{3DB68DDD9D578EB6}Assets/Vehicles/Wheeled/workspaces/Player_StrecherInjured.asi"
Configurations {
AnimSetInstanceResourceClass PC {
}
AnimSetInstanceResourceClass XBOX_ONE : PC {
}
AnimSetInstanceResourceClass XBOX_SERIES : PC {
}
AnimSetInstanceResourceClass PS4 : PC {
}
AnimSetInstanceResourceClass HEADLESS : PC {
}
AnimSetInstanceResourceClass PS5 : PC {
}
}
}
1 change: 1 addition & 0 deletions addons/carrying/Assets/Vehicles/Wheeled/workspaces/Vehicles_Wheeled.aw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ BaseSource {
"{C1CCA4C15DEF005F}Assets/Vehicles/Wheeled/workspaces/Player_Wheeled_M998.asi"
"{741E6D13EB6C6205}Assets/Vehicles/Wheeled/workspaces/Vehicles_Wheeled_M998.asi"
"{B241F1D8F215C583}Assets/Vehicles/Wheeled/workspaces/Player_CarryInjured.asi"
"{3DB68DDD9D578EB6}Assets/Vehicles/Wheeled/workspaces/Player_StrecherInjured.asi"
}
AnimGraph "{66618A6A119CAD93}Assets/Vehicles/Wheeled/workspaces/Vehicles_Wheeled_Graph.agr"
PreviewModels {
Expand Down
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.cs_cz.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Nést"
"Nošení"
"Place casualty"
"Položit"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.de_de.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Tragen"
"Am Tragen"
"Place casualty"
"Ablegen"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.en_us.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.es_es.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.fr_fr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Porter"
"Porter"
"Place casualty"
"Déposer"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.it_it.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.ja_jp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.ko_kr.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
10 changes: 5 additions & 5 deletions addons/carrying/Language/ACE_Carrying_localization.pl_pl.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Release"
"Podnieś"
"Noszenie"
"Połóż rannego"
"Połóż"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.pt_br.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
4 changes: 2 additions & 2 deletions addons/carrying/Language/ACE_Carrying_localization.ru_ru.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
StringTableRuntime {
Ids {
"ACE_Carrying-AddonName"
"ACE_Carrying-UserAction_AddCasualty"
"ACE_Carrying-UserAction_Carry"
"ACE_Carrying-UserAction_Carrying"
"ACE_Carrying-UserAction_PlaceCasualty"
"ACE_Carrying-UserAction_Release"
}
Texts {
"ACE - Carrying"
"Add Casualty"
"Carry"
"Carrying"
"Place casualty"
"Release"
}
}
Loading