Bump zscript ver to 4.14.1, plus a whole lot of stuff.
- 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:
parent
ceae806b68
commit
80db58b0d0
128 changed files with 3074 additions and 3088 deletions
|
|
@ -91,9 +91,9 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("misc/w_pkup",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
if ( players[e.Args[0]].mo.FindInventory("Ynykron") )
|
||||
players[e.Args[0]].mo.GiveInventory("YnykronAmmo",1);
|
||||
else players[e.Args[0]].mo.GiveInventory("Ynykron",1);
|
||||
if ( players[e.Args[0]].mo.FindInventory('Ynykron') )
|
||||
players[e.Args[0]].mo.GiveInventory('YnykronAmmo',1);
|
||||
else players[e.Args[0]].mo.GiveInventory('Ynykron',1);
|
||||
}
|
||||
else if ( e.Name ~== "swwmgravcheat" )
|
||||
{
|
||||
|
|
@ -103,9 +103,9 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("misc/p_pkup",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
let g = GravityPower(players[e.Args[0]].mo.FindInventory("GravityPower"));
|
||||
let g = GravityPower(players[e.Args[0]].mo.FindInventory('GravityPower'));
|
||||
if ( g ) g.EffectTics += g.default.EffectTics;
|
||||
else players[e.Args[0]].mo.GiveInventory("GravityPower",1);
|
||||
else players[e.Args[0]].mo.GiveInventory('GravityPower',1);
|
||||
}
|
||||
else if ( e.Name ~== "swwminvischeat" )
|
||||
{
|
||||
|
|
@ -115,9 +115,9 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("misc/p_pkup",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
let g = GhostPower(players[e.Args[0]].mo.FindInventory("GhostPower"));
|
||||
let g = GhostPower(players[e.Args[0]].mo.FindInventory('GhostPower'));
|
||||
if ( g ) g.EffectTics += g.default.EffectTics;
|
||||
else players[e.Args[0]].mo.GiveInventory("GhostPower",1);
|
||||
else players[e.Args[0]].mo.GiveInventory('GhostPower',1);
|
||||
}
|
||||
else if ( e.Name ~== "swwmbarriercheat" )
|
||||
{
|
||||
|
|
@ -127,9 +127,9 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("misc/p_pkup",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
let b = BarrierPower(players[e.Args[0]].mo.FindInventory("BarrierPower"));
|
||||
let b = BarrierPower(players[e.Args[0]].mo.FindInventory('BarrierPower'));
|
||||
if ( b ) b.EffectTics += b.default.EffectTics;
|
||||
else players[e.Args[0]].mo.GiveInventory("BarrierPower",1);
|
||||
else players[e.Args[0]].mo.GiveInventory('BarrierPower',1);
|
||||
}
|
||||
else if ( e.Name ~== "swwmammocheat" )
|
||||
{
|
||||
|
|
@ -139,7 +139,7 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("misc/ammo_pkup",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
players[e.Args[0]].mo.GiveInventory("TradedHammerspaceEmbiggener",8,true);
|
||||
players[e.Args[0]].mo.GiveInventory('TradedHammerspaceEmbiggener',8,true);
|
||||
for ( Inventory i=players[e.Args[0]].mo.inv; i; i=i.inv )
|
||||
{
|
||||
if ( !(i is 'Ammo') ) continue;
|
||||
|
|
@ -171,7 +171,7 @@ extend Class SWWMHandler
|
|||
S_StartSound("fabricator/use",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
players[e.Args[0]].health = players[e.Args[0]].mo.health = 1000;
|
||||
players[e.Args[0]].mo.GiveInventory("TradedHammerspaceEmbiggener",8,true);
|
||||
players[e.Args[0]].mo.GiveInventory('TradedHammerspaceEmbiggener',8,true);
|
||||
for ( Inventory i=players[e.Args[0]].mo.inv; i; i=i.inv )
|
||||
{
|
||||
if ( !(i is 'Ammo') ) continue;
|
||||
|
|
@ -200,14 +200,14 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
}
|
||||
let mo = players[e.Args[0]].mo;
|
||||
Actor f = Actor(ThinkerIterator.Create("SWWMFlag").Next());
|
||||
if ( !f ) f = mo.Spawn("SWWMFlag");
|
||||
Actor f = Actor(ThinkerIterator.Create('SWWMFlag').Next());
|
||||
if ( !f ) f = mo.Spawn('SWWMFlag');
|
||||
Vector2 spos = mo.Vec2Angle(40.,mo.angle);
|
||||
Sector sat = level.PointInSector(spos);
|
||||
double sz = sat.NextLowestFloorAt(spos.x,spos.y,mo.player.viewz-32.);
|
||||
f.SetOrigin((spos.x,spos.y,sz),false);
|
||||
f.A_SetAngle(mo.angle);
|
||||
f.Spawn("SWWMItemFog",f.pos);
|
||||
f.Spawn('SWWMItemFog',f.pos);
|
||||
f.A_StartSound("bestsound",CHAN_ITEMEXTRA);
|
||||
}
|
||||
else if ( e.Name ~== "swwmballcheat" )
|
||||
|
|
@ -268,7 +268,7 @@ extend Class SWWMHandler
|
|||
S_StartSound("misc/omgfart",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
else mo.A_StartSound("misc/omgfart",CHAN_VOICE,CHANF_OVERLAP,1.,.5);
|
||||
let f = mo.Spawn("SWWMGasCloudSpawner",mo.Vec3Angle(mo.radius*.5,mo.angle-180,mo.Height*.4));
|
||||
let f = mo.Spawn('SWWMGasCloudSpawner',mo.Vec3Angle(mo.radius*.5,mo.angle-180,mo.Height*.4));
|
||||
f.target = mo;
|
||||
f.angle = mo.angle+180;
|
||||
f.pitch = -mo.pitch;
|
||||
|
|
@ -281,9 +281,9 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("misc/p_pkup",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
let i = InvinciballPower(players[e.Args[0]].mo.FindInventory("InvinciballPower"));
|
||||
let i = InvinciballPower(players[e.Args[0]].mo.FindInventory('InvinciballPower'));
|
||||
if ( i ) i.EffectTics += i.default.EffectTics;
|
||||
else players[e.Args[0]].mo.GiveInventory("InvinciballPower",1);
|
||||
else players[e.Args[0]].mo.GiveInventory('InvinciballPower',1);
|
||||
}
|
||||
else if ( e.Name ~== "swwmstonecheat" )
|
||||
{
|
||||
|
|
@ -301,12 +301,12 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
}
|
||||
let mo = players[e.Args[0]].mo;
|
||||
Actor f = Actor(ThinkerIterator.Create("FroggyChair").Next());
|
||||
if ( !f ) f = mo.Spawn("FroggyChair");
|
||||
Actor f = Actor(ThinkerIterator.Create('FroggyChair').Next());
|
||||
if ( !f ) f = mo.Spawn('FroggyChair');
|
||||
Vector2 ofs = Actor.AngleToVector(mo.angle,40.);
|
||||
f.SetOrigin(mo.Vec2OffsetZ(ofs.x,ofs.y,mo.player.viewz-32.),false);
|
||||
f.A_SetAngle(f.AngleTo(mo));
|
||||
f.Spawn("SWWMItemFog",f.pos);
|
||||
f.Spawn('SWWMItemFog',f.pos);
|
||||
f.A_StartSound("bestsound",CHAN_ITEMEXTRA);
|
||||
}
|
||||
else if ( e.Name ~== "swwmamnesiacheat" )
|
||||
|
|
@ -317,7 +317,7 @@ extend Class SWWMHandler
|
|||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
S_StartSound("bestsound",CHAN_VOICE,CHANF_UI);
|
||||
}
|
||||
let ti = ThinkerIterator.Create("Actor");
|
||||
let ti = ThinkerIterator.Create('Actor');
|
||||
Actor a;
|
||||
while ( a = Actor(ti.Next()) )
|
||||
{
|
||||
|
|
@ -332,10 +332,10 @@ extend Class SWWMHandler
|
|||
Console.Printf("\cyLet's mop up that big mess over there.\c-");
|
||||
S_StartSound("menu/buyinv",CHAN_ITEM,CHANF_UI);
|
||||
}
|
||||
let cc = SWWMCorpseCleaner(ThinkerIterator.Create("SWWMCorpseCleaner",Thinker.STAT_USER).Next());
|
||||
let cc = SWWMCorpseCleaner(ThinkerIterator.Create('SWWMCorpseCleaner',Thinker.STAT_USER).Next());
|
||||
if ( !cc )
|
||||
{
|
||||
cc = new("SWWMCorpseCleaner");
|
||||
cc = new('SWWMCorpseCleaner');
|
||||
cc.ChangeStatNum(Thinker.STAT_USER);
|
||||
cc.Init(players[e.Args[0]].mo);
|
||||
}
|
||||
|
|
@ -343,7 +343,7 @@ extend Class SWWMHandler
|
|||
}
|
||||
else if ( e.Name ~== "swwmonfirecheat" )
|
||||
{
|
||||
let ti = ThinkerIterator.Create("Actor");
|
||||
let ti = ThinkerIterator.Create('Actor');
|
||||
Actor a;
|
||||
bool burned = false;
|
||||
while ( a = Actor(ti.Next()) )
|
||||
|
|
@ -481,7 +481,7 @@ extend Class SWWMHandler
|
|||
double shine = clamp((klinger-(gametic+e.fractic+40))/20.,0.,1.);
|
||||
int col = (kcode>4)?0:(kfail)?2:1;
|
||||
int tlen = chstr.CodePointCount();
|
||||
if ( !CheatFont ) CheatFont = Font.GetFont("TewiFontOutline");
|
||||
if ( !CheatFont ) CheatFont = Font.GetFont('TewiFontOutline');
|
||||
int width = (CheatFont.StringWidth(chstr)+3*(tlen-1));
|
||||
double xx = int(Screen.GetWidth()-width*scl)/2;
|
||||
double yy = int(Screen.GetHeight()-CheatFont.GetHeight()*scl)/2;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue