OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Bump zscript ver to 4.14.1, plus a whole lot of stuff.

Browse source 
- Try to get rid of all implicit casts from string to name, color or class.
 - Use FindClass where needed.
 - Used a map in a case where a dictionary was unneeded.
 - Use new bounce flags where needed.
 - Replace Legacy of Rust weapons/ammo.
This commit is contained in:
Mari the Deer 2025-03-13 14:45:01 +01:00
commit 80db58b0d0
128 changed files with 3074 additions and 3088 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zscript/items/swwm_baseitem.zsc
View file

@ -86,7 +86,7 @@ Mixin Class SWWMUseToPickup
Vector3 tracedir = level.Vec3Diff(userpos,itempos);
double dist = tracedir.length();
tracedir /= dist;
let cf = new("CrossLineFinder");
let cf = new('CrossLineFinder');
cf.Trace(userpos,level.PointInSector(userpos.xy),tracedir,dist,0,ignoreallactors:true);
// trigger all player cross lines found between user and item
for ( int i=0; i<cf.clines.Size(); i++ )
@ -109,7 +109,7 @@ Mixin Class SWWMOverlapPickupSound
// overlap sounds
override void PlayPickupSound( Actor toucher )
{
let hnd = SWWMHandler(EventHandler.Find("SWWMHandler"));
let hnd = SWWMHandler(EventHandler.Find('SWWMHandler'));
if ( hnd )
{
if ( hnd.lastpickuptic[toucher.PlayerNumber()] == gametic )
@ -144,7 +144,7 @@ Class SWWMRespawnTimer : SWWMNonInteractiveActor
}
override void Tick()
{
if ( !tracer || !tracer.InStateSequence(tracer.CurState,tracer.FindState("HideDoomish")) )
if ( !tracer || !tracer.InStateSequence(tracer.CurState,tracer.FindState('HideDoomish')) )
{
Destroy();
return;
@ -193,7 +193,7 @@ Mixin Class SWWMPickupGlow
{
let p = Spawn(PickupFlash,pos);
p.target = self;
p.SetStateLabel("Pickup");
p.SetStateLabel('Pickup');
}
return ret;
}
@ -203,7 +203,7 @@ Class SWWMItemOverlay : SWWMNonInteractiveActor
{
Default
{
RenderStyle "Add";
RenderStyle 'Add';
+FLOATBOB;
FloatBobStrength .25;
}
@ -262,7 +262,7 @@ Mixin Class SWWMRespawn
bSPECIAL = false;
bNOGRAVITY = true;
bINVISIBLE = true;
SetState(FindState("HideDoomish"));
SetState(FindState('HideDoomish'));
tics = 1050;
if ( (self is 'Ammo') || (self is 'MagAmmo') )
tics -= 350;
@ -273,7 +273,7 @@ Mixin Class SWWMRespawn
{
Vector3 oldpos = pos;
A_RestoreSpecialPosition();
let t = Spawn("SWWMRespawnTimer",pos);
let t = Spawn('SWWMRespawnTimer',pos);
t.tracer = self;
t.special1 = tics;
t.A_SetSize(radius,height);