zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-01 00:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added FlyBob Multiplier for Player

Browse source
This commit is contained in:
Boondorl 2023-01-01 20:12:09 -05:00 committed by Christoph Oelckers
parent 73159dac3e
commit 0d23816179
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/namedef_custom.h
View file

@ -284,6 +284,7 @@ xx(SideMove2)
xx(Face) xx(Face)
xx(Slot) xx(Slot)
xx(SoundClass) xx(SoundClass)
xx(FlyBob)
xx(ViewBob) xx(ViewBob)
xx(WaterClimbSpeed) xx(WaterClimbSpeed)
xx(DamageFade) xx(DamageFade)

2
src/playsim/p_mobj.cpp
View file

@ -2418,7 +2418,7 @@ static void P_ZMovement (AActor *mo, double oldfloorz)
if (!mo->IsNoClip2() && fViewBob) if (!mo->IsNoClip2() && fViewBob)
{ {
mo->AddZ(DAngle::fromDeg(360 / 80.f * mo->Level->maptime).Sin() / 8); mo->AddZ(DAngle::fromDeg(360 / 80.f * mo->Level->maptime).Sin() / 8 * mo->FloatVar(NAME_FlyBob));
} }
if (!(mo->flags8 & MF8_NOFRICTION)) if (!(mo->flags8 & MF8_NOFRICTION))

5
wadsrc/static/zscript/actors/player/player.zs
View file

@ -46,6 +46,7 @@ class PlayerPawn : Actor
double AirCapacity; // Multiplier for air supply underwater. double AirCapacity; // Multiplier for air supply underwater.
Class<Inventory> FlechetteType; Class<Inventory> FlechetteType;
color DamageFade; // [CW] Fades for when you are being damaged. color DamageFade; // [CW] Fades for when you are being damaged.
double FlyBob; // [B] Fly bobbing mulitplier
double ViewBob; // [SP] ViewBob Multiplier double ViewBob; // [SP] ViewBob Multiplier
double WaterClimbSpeed; // [B] Speed when climbing up walls in water double WaterClimbSpeed; // [B] Speed when climbing up walls in water
double FullHeight; double FullHeight;
@ -76,6 +77,7 @@ class PlayerPawn : Actor
property FlechetteType: FlechetteType; property FlechetteType: FlechetteType;
property Portrait: Portrait; property Portrait: Portrait;
property TeleportFreezeTime: TeleportFreezeTime; property TeleportFreezeTime: TeleportFreezeTime;
property FlyBob: FlyBob;
property ViewBob: ViewBob; property ViewBob: ViewBob;
property WaterClimbSpeed : WaterClimbSpeed; property WaterClimbSpeed : WaterClimbSpeed;
@ -119,6 +121,7 @@ class PlayerPawn : Actor
Player.MugShotMaxHealth 0; Player.MugShotMaxHealth 0;
Player.FlechetteType "ArtiPoisonBag3"; Player.FlechetteType "ArtiPoisonBag3";
Player.AirCapacity 1; Player.AirCapacity 1;
Player.FlyBob 1;
Player.ViewBob 1; Player.ViewBob 1;
Player.WaterClimbSpeed 3.5; Player.WaterClimbSpeed 3.5;
Player.TeleportFreezeTime 18; Player.TeleportFreezeTime 18;
@ -563,7 +566,7 @@ class PlayerPawn : Actor
} }
else if (bNoGravity && !player.onground) else if (bNoGravity && !player.onground)
{ {
player.bob = 0.5; player.bob = min(abs(0.5 * FlyBob), MAXBOB);
} }
else else
{ {