OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Various rebalances. Corrected some things that weren't 1:1 with UT.

Browse source 
Restored original flak chunk damage function (no longer falls off with distance).
Fixed the minigun altfire shooting bullets at the same speed as the primary fire.
Small hackaround for janky player movement while moving down slopes.
[WIP] The very beginning of an UT gore system (toggleable).
This commit is contained in:
Marisa the Magician 2018-09-05 18:56:04 +02:00
commit 1c0f7d08a5
11 changed files with 99 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

67
zscript/utcommon.zsc
View file

@ -1,6 +1,7 @@
Class UTPlayer : DoomPlayer
{
bool lastground;
int lastgroundtic;
double lastvelz, prevvelz;
transient CVar footsteps, utmovement, doomspeed, doomaircontrol, nowalkdrop;
Vector2 acceleration;
@ -190,15 +191,15 @@ Class UTPlayer : DoomPlayer
if ( player.onground && !bNoGravity && !lastground && (waterlevel < 3) )
{
player.jumptics = 0;
if ( lastvelz < -4 )
if ( lastvelz < -8 )
{
double vol = clamp((-lastvelz-4)*0.05,0.01,1.0);
double vol = clamp((-lastvelz-8)*0.05,0.01,1.0);
if ( ((waterlevel > 0) || GetFloorTerrain().IsLiquid) && !bOnMobj ) A_PlaySound("ut/wetsplash",CHAN_AUTO,vol);
else A_PlaySound("*uland",CHAN_AUTO,vol);
}
else forcefootstep = true;
}
if ( forcefootstep || ((abs(sin(ang)) >= 1.0) && player.onground && (player.cmd.forwardmove || player.cmd.sidemove) && (waterlevel < 3)) )
if ( forcefootstep || ((abs(sin(ang)) >= 1.0) && player.onground && lastground && (player.jumptics == 0) && (player.cmd.forwardmove || player.cmd.sidemove) && (waterlevel < 3)) )
{
double vol = abs(vel.xy.length())*0.03;
if ( forcefootstep ) vol = clamp(-lastvelz*0.05,0.01,1.0);
@ -237,6 +238,8 @@ Class UTPlayer : DoomPlayer
}
else Angle += cmd.yaw*(360./65536.);
player.onground = (pos.z <= floorz) || bOnMobj || bMBFBouncer || (player.cheats & CF_NOCLIP2);
if ( player.onground ) lastgroundtic = gametic;
if ( (abs(lastgroundtic-gametic) < 4) && (player.jumptics == 0) ) player.onground = true;
double friction = FrictionToUnreal();
double fs = TweakSpeeds(1.0,0.0);
if ( !doomspeed.GetBool() )
@ -289,6 +292,7 @@ Class UTPlayer : DoomPlayer
player.camera = player.mo;
}
player.vel *= 0;
player.jumptics = -2;
}
else
{
@ -1102,6 +1106,54 @@ Class UTBlueKey : BlueCard
}
}
Class ShredCorpseHitbox : Actor
{
int accdamage;
Default
{
+NOGRAVITY;
-SOLID;
+DONTSPLASH;
+SHOOTABLE;
Health int.max;
}
override void PostBeginPlay()
{
if ( !target )
{
Destroy();
return;
}
accdamage = target.Health;
A_SetSize(target.radius,target.height);
}
override void Tick()
{
Super.Tick();
if ( !target || (target.Health > 0) || target.InStateSequence(target.CurState,target.FindState("XDeath")) )
{
Destroy();
return;
}
SetOrigin(target.pos,true);
A_SetSize(target.radius,target.height);
}
override int DamageMobj( Actor inflictor, Actor source, int damage, Name mod, int flags, double angle )
{
accdamage -= damage;
int gibhealth = (target.GibHealth==int.min)?-target.SpawnHealth():target.GibHealth;
if ( accdamage < gibhealth )
{
// force gib (cheap ATM)
State gib = target.FindState("XDeath");
if ( gib ) target.SetState(gib);
Destroy();
}
return 0;
}
}
Class GenericFlash : HUDMessageBase
{
Color col;
@ -1445,6 +1497,15 @@ Class UTMainHandler : StaticEventHandler
Screen.DrawTexture(tex,true,0,0,DTA_VirtualWidth,1024,DTA_VirtualHeight,768);
}
override void WorldThingDied( WorldEvent e )
{
if ( e.Thing.bDONTGIB ) return;
// attach damage accumulator for corpses
if ( !CVar.GetCVar('flak_corpsedamage').GetBool() ) return;
let a = Actor.Spawn("ShredCorpseHitbox",e.Thing.pos);
a.target = e.Thing;
}
static void DoFlash( Actor camera, Color c, int duration )
{
QueuedFlash qf = new("QueuedFlash");