OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Begin VisualThinker migration. Some effects still pending.

Browse source
This commit is contained in:
Mari the Deer 2024-06-21 19:32:13 +02:00
commit 77b1ad89a9
28 changed files with 577 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

8
zscript/items/swwm_funstuff.zsc
View file

@ -330,7 +330,7 @@ Class SWWMGasCloud : SWWMNonInteractiveActor
}
}
Class SWWMFart : SWWMHalfSmoke
Class SWWMFart : SWWMSmoke
{
Default
{
@ -1197,10 +1197,10 @@ Class Chancebox : Actor
for ( int i=0; i<numpt; i++ )
{
Vector3 pvel = SWWMUtility.Vec3FromAngles(FRandom[ExploS](0,360),FRandom[ExploS](-90,90))*FRandom[ExploS](.3,8);
let s = Spawn("SWWMHalfSmoke",Vec3Offset(0,0,16));
let s = SWWMAnimSprite.SpawnAt("SWWMHalfSmoke",Vec3Offset(0,0,16));
s.vel = pvel;
s.SetShade(Color(2,1,3)*Random[ExploS](64,85));
s.special1 = Random[ExploS](1,4);
s.scolor = Color(2,1,3)*Random[ExploS](64,85);
s.framestep = Random[ExploS](2,5);
s.alpha *= .4;
s.scale *= 2.4;
}

6
zscript/items/swwm_lamp.zsc
View file

@ -219,7 +219,7 @@ Class LampMoth : Actor
lifespan--;
if ( lifespan <= 0 )
{
let s = Spawn("SWWMSmallSmoke",pos);
let s = SWWMAnimSprite.SpawnAt("SWWMSmallSmoke",pos);
s.alpha *= .3;
Destroy();
}
@ -255,7 +255,7 @@ Class LampMoth : Actor
TNT1 A 1
{
A_StartSound("moth/die",CHAN_VOICE,CHANF_OVERLAP,.6,2.5);
let s = Spawn("SWWMSmallSmoke",pos);
let s = SWWMAnimSprite.SpawnAt("SWWMSmallSmoke",pos);
s.alpha *= .3;
}
Stop;
@ -321,7 +321,7 @@ Class CompanionLamp : Actor
m.Destroy();
return;
}
let s = Spawn("SWWMSmallSmoke",m.pos);
let s = SWWMAnimSprite.SpawnAt("SWWMSmallSmoke",m.pos);
s.alpha *= .3;
m.master = parent;
m.lamp = self;

15
zscript/items/swwm_miscitems.zsc
View file

@ -366,7 +366,7 @@ Class TheBall : Actor
for ( int i=0; i<numpt; i++ )
{
Vector3 pvel = SWWMUtility.Vec3FromAngles(FRandom[Spreadgun](0,360),FRandom[Spreadgun](-90,90))*FRandom[Spreadgun](1,8);
let s = Spawn("SWWMSmallSmoke",pos);
let s = SWWMAnimSprite.SpawnAt("SWWMSmallSmoke",pos);
s.scale *= 3.;
s.alpha *= .2;
s.vel = pvel;
@ -378,7 +378,7 @@ Class TheBall : Actor
heat -= 0.004+0.0004*vel.length();
A_SoundVolume(CHAN_WEAPON,vel.length()/75.);
if ( heat <= 0 ) return;
let s = Spawn("SWWMHalfSmoke",pos);
let s = SWWMAnimSprite.SpawnAt("SWWMHalfSmoke",pos);
s.alpha *= heat;
}
void A_HandleBounce()
@ -599,11 +599,12 @@ Class SaltBeam : SWWMNonInteractiveActor
for ( int i=4; i<t.Results.Distance; i+=8 )
{
if ( Random[Spreadgun](0,Stamina) ) continue;
let b = Actor.Spawn("SWWMHalfSmoke",level.Vec3Offset(pos,x*i));
b.Scale *= FRandom[Spreadgun](.6,.8);
b.special1 = Random[Spreadgun](1,2);
b.A_SetRenderStyle(.3,STYLE_AddShaded);
b.SetShade(Color(1,3,4)*Random[Spreadgun](48,63));
let b = SWWMAnimSprite.SpawnAt("SWWMHalfSmoke",level.Vec3Offset(pos,x*i));
b.scale *= FRandom[Spreadgun](.6,.8);
b.framestep =Random[Spreadgun](2,3);
b.alpha = .3;
b.SetRenderStyle(STYLE_AddShaded);
b.scolor = Color(1,3,4)*Random[Spreadgun](48,63);
b.vel += x*FRandom[Spreadgun](-.5,3);
}
if ( t.Results.HitType != TRACE_HitNone )

18
zscript/items/swwm_powerups_vip.zsc
View file

@ -369,11 +369,12 @@ Class MykradvoBurst : SWWMNonInteractiveActor
for ( int i=0; i<numpt; i++ )
{
Vector3 pvel = SWWMUtility.Vec3FromAngles(FRandom[ExploS](0,360),FRandom[ExploS](-90,90))*FRandom[ExploS](.25,8);
let s = Spawn("SWWMHalfSmoke",pos);
let s = SWWMAnimSprite.SpawnAt("SWWMHalfSmoke",pos);
s.vel = pvel;
s.SetShade(Color(1,1,1)*Random[ExploS](128,160)+Color(28,0,31));
s.A_SetRenderStyle(.4,STYLE_AddShaded);
s.special1 = Random[ExploS](1,5);
s.scolor = Color(1,1,1)*Random[ExploS](128,160)+Color(28,0,31);
s.alpha = .4;
s.SetRenderStyle(STYLE_AddShaded);
s.framestep = Random[ExploS](2,6);
s.scale *= 2.;
}
numpt = Random[ExploS](8,12);
@ -405,11 +406,12 @@ Class MykradvoBurst : SWWMNonInteractiveActor
for ( int j=0; j<numpt; j++ )
{
Vector3 pvel = SWWMUtility.Vec3FromAngles(FRandom[ExploS](0,360),FRandom[ExploS](-90,90))*FRandom[ExploS](.25,8);
let s = Spawn("SWWMHalfSmoke",pos);
let s = SWWMAnimSprite.SpawnAt("SWWMHalfSmoke",pos);
s.vel = pvel;
s.SetShade(Color(1,1,1)*Random[ExploS](128,160)+Color(28,0,31));
s.A_SetRenderStyle(.4,STYLE_AddShaded);
s.special1 = Random[ExploS](1,5);
s.scolor = Color(1,1,1)*Random[ExploS](128,160)+Color(28,0,31);
s.alpha = .4;
s.SetRenderStyle(STYLE_AddShaded);
s.framestep = Random[ExploS](2,6);
s.scale *= 2.;
}
numpt = Random[ExploS](1,2);