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

Jump to bottom

Replace ACT_GMOD_SIT_ROLLERCOASTER with ACT_HL2MP_SIT animation on playerstart chairs #382

Merged
merged 8 commits into from
Apr 17, 2024
Merged

Replace ACT_GMOD_SIT_ROLLERCOASTER with ACT_HL2MP_SIT animation on playerstart chairs #382

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef78be0
Update playerstart_chairs.lua
sigurdjoergensen Jan 3, 2024
eea4210
Update playerstart_chairs.lua
sigurdjoergensen Jan 3, 2024
fa3b1aa
fix vehicle reference and case
sigurdjoergensen Jan 3, 2024
47d4119
Update playerstart_chairs.lua
sigurdjoergensen Jan 3, 2024
3945824
Update playerstart_chairs.lua
sigurdjoergensen Jan 3, 2024
896bb4a
Merge branch 'master' into sigurdjoergensen-patch-1
sigurdjoergensen Jan 3, 2024
6f91bbe
Add files via upload
sigurdjoergensen Jan 7, 2024
75acb31
Revert "Add files via upload"
sigurdjoergensen Apr 14, 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
8 changes: 4 additions & 4 deletions lua/acf/entities/playerstart_chairs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ local function AddVehicle(Class, Data)
list.Set("Vehicles", Class, Entry)
end

local function HandleRollercoasterAnimation(_, Player)
return Player:SelectWeightedSequence(ACT_GMOD_SIT_ROLLERCOASTER)
local function HandlePHXSeatAnimation(_, Player)
return Player:SelectWeightedSequence(ACT_HL2MP_SIT)
end

local function HandlePHXVehicleAnimation(_, Player)
Expand Down Expand Up @@ -51,7 +51,7 @@ AddVehicle("playerstart_chairs_airboat", {
AddVehicle("playerstart_chairs_seated", {
Name = "Sitting Pose",
Model = "models/chairs_playerstart/sitposealt.mdl",
Animation = HandleRollercoasterAnimation,
Animation = HandlePHXSeatAnimation,
})

AddVehicle("playerstart_chairs_podpose", {
Expand All @@ -68,7 +68,7 @@ Category = "Playerstart Chairs (Experimental)"
AddVehicle("playerstart_chairs_seated_alt", {
Name = "Sitting Pose (Alt Physics)",
Model = "models/chairs_playerstart/sitpose.mdl",
Animation = HandleRollercoasterAnimation,
Animation = HandlePHXSeatAnimation,
})

AddVehicle("playerstart_chairs_standing", {
Expand Down
Loading