OrdinaryMagician/flak_m
OrdinaryMagician/flak_m
1
Fork 0
Code Activity

Merge branch 'devel' into experimental

Browse source
This commit is contained in:
Marisa the Magician 2019-04-20 13:26:37 +02:00
commit c36a730d13
13 changed files with 42 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

10
zscript/flakcannon.zsc
View file

@ -55,7 +55,7 @@ Class ChunkLight : DynamicLight
Destroy();
return;
}
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
args[LIGHT_RED] = int(255*(10-target.frame)*0.1);
args[LIGHT_GREEN] = int(224*(10-target.frame)*0.1);
args[LIGHT_BLUE] = int(128*(10-target.frame)*0.1);
@ -84,7 +84,7 @@ Class ChunkTrail : Actor
override void Tick()
{
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
if ( InStateSequence(CurState,FindState("Death")) ) return;
if ( !target )
{
@ -196,7 +196,7 @@ Class FlakChunk : Actor
{
oldvel = vel;
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
if ( waterlevel > 0 )
{
vel.xy *= 0.98;
@ -396,7 +396,7 @@ Class SlugSmoke : Actor
override void Tick()
{
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
lifetime += lifespeed;
let s = Spawn("UTSmoke",pos);
s.vel = (FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5),FRandom[Flak](-0.5,0.5));
@ -430,7 +430,7 @@ Class SlugLight : DynamicLight
override void Tick()
{
Super.Tick();
if ( globalfreeze || level.frozen ) return;
if ( isFrozen() ) return;
args[LIGHT_RED] = int(255*lifetime);
args[LIGHT_GREEN] = int(224*lifetime);
args[LIGHT_BLUE] = int(128*lifetime);