OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

More stuff I missed.

Browse source
This commit is contained in:
Mari the Deer 2023-03-17 13:25:54 +01:00
commit 95dd4a715a
38 changed files with 68 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

6
zscript/compat/swwm_compat.zsc
View file

@ -1,5 +1,5 @@
// level compatibility scripts
// sometimes shit breaks, or certain changes are needed for balance or to mesh
// sometimes stuff breaks, or certain changes are needed for balance or to mesh
// with the mod's mechanics better, this is here for that
Class SWWMLevelCompatibility : LevelPostProcessor
@ -193,11 +193,11 @@ Class SWWMLevelCompatibility : LevelPostProcessor
SetThingID(314,666);
SetThingID(315,667);
// unfortunately the line special wrangling has to be done one tic after map load
// because fuck absolutely everything about how ACS works
// because ACS is just that goddamn weird
break;
// Doom 2 MAP07
case '291F24417FB3DD411339AE82EF9B3597':
// remove excess backpacks (there's 10 of them for fuck's sake)
// remove excess backpacks (there's 10 of them for crying out loud)
for ( uint i=0; i<GetThingCount(); i++ )
{
if ( GetThingEdNum(i) != 8 ) continue;

14
zscript/compat/swwm_hdoom.zsc
View file

@ -41,7 +41,7 @@ Class SWWMHDoomHandler : StaticEventHandler
"\cx┃ ┃\c-\n"
"\cx┃ \cfget bonked \cx┃\c-\n"
"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-");
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("compat/warn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
override void WorldLoaded( WorldEvent e )
@ -78,13 +78,13 @@ Class SWWMHDoomHandler : StaticEventHandler
}
if ( timer == 16 )
{
S_StartSound("hdoom/horny",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("hdoom/horny",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("hdoom/horny",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("hdoom/horny",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
if ( timer == callout_len+24 )
{
S_StartSound("misc/spawn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("misc/spawn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
bonker = TexMan.CheckForTexture("graphics/HDoom_Bonker.png");
bonk = TexMan.CheckForTexture("graphics/HDoom_Bonk.png");
bonked = TexMan.CheckForTexture("graphics/HDoom_Bonked.png");
@ -92,8 +92,8 @@ Class SWWMHDoomHandler : StaticEventHandler
else if ( (timer >= callout_len+32) && !(timer%16) )
{
double ptch = FRandom[hdscreen](.95,1.05);
S_StartSound("hdoom/bonk",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE,ptch);
S_StartSound("hdoom/bonk",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE,ptch);
S_StartSound("hdoom/bonk",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE,ptch);
S_StartSound("hdoom/bonk",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE,ptch);
}
timer++;
}

10
zscript/compat/swwm_shame.zsc
View file

@ -47,7 +47,7 @@ Class SWWMBrutalHandler : StaticEventHandler
"\cx┃ \cfand trust me, it's better this way. \cx┃\c-\n"
"\cx┃ \cf<See you again, have a nice day> \cx┃\c-\n"
"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-");
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("compat/warn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
break;
}
}
@ -68,16 +68,16 @@ Class SWWMBrutalHandler : StaticEventHandler
}
if ( timer == 35 )
{
S_StartSound("misc/spawn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("misc/spawn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("misc/spawn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
else if ( timer == 140 )
{
for ( int i=0; i<85; i++ )
scr[i] = TexMan.CheckForTexture(String.Format("graphics/BDScreen/BDSCR%03d.jpg",i+1));
S_ChangeMusic("",force:true);
S_StartSound("brutal/bdscreen",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("brutal/bdscreen",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("brutal/bdscreen",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("brutal/bdscreen",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
else if ( timer == 484 ) ThrowAbortException("This manual abort is for your own safety");
timer++;

4
zscript/handler/swwm_handler.zsc
View file

@ -111,7 +111,7 @@ Class SWWMHandler : EventHandler
{
String dat = Wads.ReadLump(lmp);
Array<String> list;
// fucking Windows
// Windows pls
dat.Replace("\r","");
list.Clear();
dat.Split(list,"\n");
@ -129,7 +129,7 @@ Class SWWMHandler : EventHandler
{
String dat = Wads.ReadLump(lmp);
Array<String> list;
// fucking Windows
// Windows pls
dat.Replace("\r","");
list.Clear();
dat.Split(list,"\n");

2
zscript/handler/swwm_handler_damage.zsc
View file

@ -293,7 +293,7 @@ extend Class SWWMHandler
if ( !tookdamage[pnum] )
{
int spreebonus = 10*(spreecount[pnum]);
// taper off after 10x (some people go really far with these, holy fuck)
// taper off after 10x (some people go really far with these)
if ( spreecount[pnum] > 10 ) spreebonus = int(10*((spreecount[pnum]/10.)**.25));
score += 100+spreebonus;
if ( (spreecount[pnum] > 0) && scr )

4
zscript/handler/swwm_handler_debugrender.zsc
View file

@ -10,7 +10,7 @@ extend Class SWWMHandler
Vector3 a = SWWMUtility.ProjectPoint(projdata,e.viewpos+level.Vec3Diff(e.viewpos,apos)),
b = SWWMUtility.ProjectPoint(projdata,e.viewpos+level.Vec3Diff(e.viewpos,bpos));
if ( (a.z > 1.) && (b.z > 1.) ) return;
if ( (a.z == -double.infinity) || (b.z == -double.infinity) ) return; // how the fuck???
if ( (a.z == -double.infinity) || (b.z == -double.infinity) ) return; // how???
double da, db, s;
Vector3 p;
da = a dot (0.,0.,-1.)-1.;
@ -41,7 +41,7 @@ extend Class SWWMHandler
{
Vector3 a = ndc[i], b = ndc[(i+1)%64];
if ( (a.z > 1.) && (b.z > 1.) ) continue;
if ( (a.z == -double.infinity) || (b.z == -double.infinity) ) continue; // how the fuck???
if ( (a.z == -double.infinity) || (b.z == -double.infinity) ) continue; // how???
double da, db, s;
Vector3 p;
da = a dot (0.,0.,-1.)-1.;

6
zscript/handler/swwm_handler_iwantdie.zsc
View file

@ -1,9 +1,9 @@
// I WANT DIE
// fuck
// tokens
Class DontDuplicate : Inventory {}
Class DontDuplicate2 : Inventory {}
Class HOLYCOWIMTOTALLYGOINGSOFASTOHFUCK : Inventory
Class GOTTAGOFAST : Inventory
{
override void DoEffect()
{
@ -49,7 +49,7 @@ extend Class SWWMHandler
}
if ( e.Thing.bISMONSTER && !(e.Thing is 'PlayerPawn') )
{
e.Thing.GiveInventory("HOLYCOWIMTOTALLYGOINGSOFASTOHFUCK",1);
e.Thing.GiveInventory("GOTTAGOFAST",1);
// avoid if it has some sort of special handling
if ( e.Thing.special || e.Thing.tid || e.Thing.bDORMANT ) return;
// random chance to spawn doubles

2
zscript/handler/swwm_handler_process.zsc
View file

@ -308,7 +308,7 @@ extend Class SWWMHandler
players[e.Args[0]].mo.GiveInventory(item,1,true);
}
else players[e.Args[0]].mo.GiveInventory(item,e.Args[2],true);
// fucky workaround
// workaround for some items
let inv = players[e.Args[0]].mo.FindInventory(item);
if ( inv && (inv.Amount <= 0) && !inv.bKEEPDEPLETED ) inv.Destroy();
if ( item is 'Weapon' )

4
zscript/handler/swwm_handler_worldload.zsc
View file

@ -345,10 +345,10 @@ extend Class SWWMHandler
}
// doom vacation map01 hackaround for OPEN script not letting us
// change certain line specials in levelpostprocessor because
// HOLY FUCK IS EVERYTHING SHIT SOMETIMES
// ACS is just mindbogglingly weird like that, seriously
if ( (level.GetChecksum() ~== "F286BABF0D152259CD6B996E8920CA70")
|| (level.GetChecksum() ~== "A52BD2038CF814101AAB7D9C78F9ACE2") )
level.ExecuteSpecial(ACS_Execute,null,null,false,-Int('DVACATION_UNFUCK'));
level.ExecuteSpecial(ACS_Execute,null,null,false,-Int('DVACATION_UNSCREW'));
// rampancy boss brain fix (repeatedly triggering "map clear")
let ti = ThinkerIterator.Create("Actor");
Actor a, brain;

2
zscript/handler/swwm_handler_worldthings.zsc
View file

@ -119,7 +119,7 @@ extend Class SWWMHandler
level.ExecuteSpecial(Door_Open,e.Thing,null,false,10,16);
// keep the portal closed, you can't leave unless you
// kill everyone else
let t = new("UglyBoyGetsFuckedUp");
let t = new("KoraxYeeted");
t.ChangeStatNum(Thinker.STAT_USER);
}
// Archangelus death

14
zscript/handler/swwm_statichandler.zsc
View file

@ -65,7 +65,7 @@ Class SWWMStaticHandler : StaticEventHandler
{
mpwarned = true;
Console.Printf("\cgWARNING:\c- Multiplayer is no longer officially supported, desyncs and other issues may potentially happen. You are on your own.");
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("compat/warn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
// sanity check
Array<Thinker> stinkers;
@ -179,7 +179,7 @@ Class SWWMStaticHandler : StaticEventHandler
{
mpwarned = true;
Console.Printf("\cgWARNING:\c- Multiplayer is no longer officially supported, desyncs and other issues may potentially happen. You are on your own.");
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("compat/warn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
// warning for unsupported
if ( Wads.FindLumpFullName("swwmgamesupported",0,true) != -1 ) return;
@ -191,7 +191,7 @@ Class SWWMStaticHandler : StaticEventHandler
"\cx┃ \cjIssues \cfCAN\cj and \cfWILL\cj happen. \cx┃\c-\n"
"\cx┃ \cr[\cgYOU ARE ON YOUR OWN\cr] \cx┃\c-\n"
"\cx┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛\c-");
S_StartSound("compat/warn",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("compat/warn",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
override void RenderOverlay( RenderEvent e )
@ -516,15 +516,15 @@ Class SWWMStaticHandler : StaticEventHandler
let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler"));
if ( hnd && hnd.detected )
{
S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("crash/glass",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("crash/glass",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("crash/glass",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
else S_StartSound("crash/crash",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
else S_StartSound("crash/crash",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
else if ( timer == 70 )
{
Console.Printf("\cf%s\c-",StringTable.Localize("$CRASHMSG"..msgpick.."B"));
S_StartSound("crash/curb",CHAN_YOUDONEFUCKEDUP,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
S_StartSound("crash/curb",CHAN_YABLEWIT,CHANF_UI|CHANF_NOPAUSE|CHANF_OVERLAP,1,ATTN_NONE);
}
else if ( timer == 140 )
{

2
zscript/handler/swwm_statichandler_achievements.zsc
View file

@ -115,7 +115,7 @@ extend Class SWWMStaticHandler
while ( lmp != -1 )
{
dat = Wads.ReadLump(lmp);
// fucking Windows
// Windows pls
dat.Replace("\r","");
list.Clear();
dat.Split(list,"\n");

2
zscript/hud/swwm_hud_topstuff.zsc
View file

@ -823,7 +823,7 @@ extend Class SWWMStatusBar
int label = am_showmaplabel;
String ln = level.levelname;
if ( ln.Left(1) == "$" ) ln = StringTable.Localize(ln);
// level name may contain trailing whitespace due to DEHACKED fuckery, so strip it
// level name may contain trailing whitespace due to DEHACKED nonsense, so strip it
ln.StripRight();
int iof;
if ( ((iof = ln.RightIndexOf(" - by: ")) != -1) || ((iof = ln.RightIndexOf(" - by ")) != -1) || ((iof = ln.RightIndexOf(" - ")) != -1) )

6
zscript/hud/swwm_hudextra.zsc
View file

@ -702,7 +702,7 @@ Class DSMapTitle : HUDMessageBase
txtsub = level.authorname;
if ( txt.Left(1) == "$" ) txt = StringTable.Localize(txt);
if ( txtsub.Left(1) == "$" ) txtsub = StringTable.Localize(txtsub);
// level name may contain trailing whitespace due to DEHACKED fuckery, so strip it
// level name may contain trailing whitespace due to DEHACKED nonsense, so strip it
txt.StripRight();
int sep;
if ( (sep = txt.RightIndexOf(" - by: ")) != -1 ) // 20 heretics, spooktober
@ -731,7 +731,7 @@ Class DSMapTitle : HUDMessageBase
if ( lmp == -1 ) ThrowAbortException("font definition file not found");
String dat = Wads.ReadLump(lmp);
Array<String> list, ln;
// fucking Windows
// Windows pls
dat.Replace("\r","");
list.Clear();
dat.Split(list,"\n");
@ -763,7 +763,7 @@ Class DSMapTitle : HUDMessageBase
lmp = Wads.CheckNumForFullname("graphics/dsmapfont_sub.txt");
if ( lmp == -1 ) ThrowAbortException("sub font definition file not found");
dat = Wads.ReadLump(lmp);
// fucking Windows
// Windows pls
dat.Replace("\r","");
list.Clear();
dat.Split(list,"\n");

2
zscript/items/swwm_ammoextra.zsc
View file

@ -492,7 +492,7 @@ Class HammerspaceEmbiggener : Inventory
}
return true;
}
// new ammo suddenly added? upgrade it (this shouldn't happen unless fucky scripting has been involved)
// new ammo suddenly added? upgrade it (this shouldn't happen unless weird scripting has been involved)
if ( (item is 'Ammo') && !Owner.FindInventory(Ammo(item).GetParentAmmo()) )
{
if ( Ammo(item).BackpackMaxAmount > 0 )

2
zscript/menu/swwm_inter.zsc
View file

@ -34,7 +34,7 @@ Class SWWMStatScreen : StatusScreen abstract
authortexts[i] = lnametexts[i].Mid(iof+3);
lnametexts[i].Truncate(iof);
}
// level name may contain trailing whitespace due to DEHACKED fuckery, so strip it
// level name may contain trailing whitespace due to DEHACKED nonsense, so strip it
lnametexts[i].StripRight();
}
}

4
zscript/menu/swwm_menus.zsc
View file

@ -962,8 +962,8 @@ Class OptionMenuItemTrapOption : OptionMenuItem
}
}
// this is kind of a fucky
// scalesliders kinda fuck up keyboard input if the step is not 1,
// this is kind of a hot mess
// scalesliders don't mesh well with keyboard input if the step is not 1,
// so I'll fix that for my super special use cases
Class OptionMenuItemScaleSliderFix : OptionMenuItemScaleSlider
{

2
zscript/player/swwm_player.zsc
View file

@ -645,7 +645,7 @@ Class Demolitionist : PlayerPawn
else Console.Printf(StringTable.Localize("$SWWM_FINDSECRETREM"),player.GetUserName(),score);
SWWMCredits.Give(player,score);
SWWMScoreObj.Spawn(score,Vec3Offset(0,0,Height/2));
// somehow ongivesecret can be called BEFORE PostBeginPlay (what the fuck)
// somehow ongivesecret can be called BEFORE PostBeginPlay (wat)
if ( !mystats ) mystats = SWWMStats.Find(player);
mystats.secrets++;
return true;

4
zscript/swwm_common.zsc
View file

@ -3,7 +3,7 @@
// extra sound channels for the mod
enum ESWWMGZChannels
{
CHAN_YOUDONEFUCKEDUP = 63200, // exception handler
CHAN_YABLEWIT = 63200, // exception handler
CHAN_DEMOVOICE = 63201, // demolitionist voices
CHAN_FOOTSTEP = 63202, // footstep sounds and others
CHAN_WEAPONEXTRA = 63203, // additional weapon sounds (usually loops)
@ -21,7 +21,7 @@ enum ESWWMGZChannels
CHAN_FUELREGEN = 63215 // sound of fuel regenerating
};
const FallbackTag = "AWESOME IT'S PENIS"; // used on tag processing, please don't mind the actual string used)
const FallbackTag = "WHAT IN THE GODDAMN"; // used on tag processing, please don't mind the actual string used)
const MaxBouncePerTic = 40; // maximum simultaneous bounces in one tic for a lightweight actor before we consider it's stuck
// super-minimal tick override that simply advances states when not frozen

2
zscript/swwm_common_fx.zsc
View file

@ -1198,7 +1198,7 @@ Class SWWMBulletTrail : LineTracer
t.Trace(pos,level.PointInSector(pos.xy),dir,dist,0);
foreach ( l:t.ShootThroughList )
{
// have to do both because WOW, HOW THE FUCK IS THIS INTENTIONAL???
// have to do both separately, for whatever reason
l.Activate(target,0,SPAC_PCross);
l.Activate(target,0,SPAC_Impact);
}

2
zscript/swwm_thinkers.zsc
View file

@ -1,7 +1,7 @@
// various stat tracking thinkers and others
// Korax instakill handler
Class UglyBoyGetsFuckedUp : Thinker
Class KoraxYeeted : Thinker
{
bool wedone;

2
zscript/utility/swwm_utility.zsc
View file

@ -10,7 +10,7 @@ Class SWWMUtility
if ( lmp == -1 ) ThrowAbortException("'cvarinfo.base' not found");
String dat = Wads.ReadLump(lmp);
Array<String> list, ln;
// fucking Windows
// Windows pls
dat.Replace("\r","");
list.Clear();
dat.Split(list,"\n");

2
zscript/utility/swwm_utility_compat.zsc
View file

@ -107,7 +107,7 @@ extend Class SWWMUtility
let lmp = Wads.CheckNumForFullName(fname);
if ( lmp == -1 ) return false;
String dat = Wads.ReadLump(lmp);
// fucking Windows
// Windows pls
dat.Replace("\r","");
Array<String> list;
list.Clear();

4
zscript/utility/swwm_utility_info.zsc
View file

@ -280,7 +280,7 @@ extend Class SWWMUtility
return a;
}
// gendered languages are a fuck
// because gendered languages
static bool SellFemaleItem( Inventory i, String loc = "SWWM_SELLEXTRA_FEM" )
{
// no gendered string alt
@ -311,7 +311,7 @@ extend Class SWWMUtility
if ( i is 'SWWMAmmo' ) return StringTable.Localize("$T_"..SWWMAmmo(i).PickupTag.."S");
return i.GetTag();
}
// because of zscript fuckery with GetDefaultByType
// because of zscript weirdness with GetDefaultByType
static string GetAmmoTagClass( Class<Inventory> i )
{
if ( i is 'MagAmmo' ) return StringTable.Localize("$T_"..GetDefaultByType((Class<MagAmmo>)(i)).PickupTag.."S");

2
zscript/utility/swwm_utility_map.zsc
View file

@ -9,7 +9,7 @@ enum EExitType
extend Class SWWMUtility
{
// how the fuck is this not available to ZScript?
// because this just wasn't in ZScript before
// copied from P_PointOnLineSidePrecise()
deprecated("4.11", "Use Level.PointOnLineSide() instead") static int PointOnLineSide( Vector2 p, Line l )
{

8
zscript/weapons/swwm_cbt_fx.zsc
View file

@ -318,9 +318,9 @@ Class BusterWall : Thinker
if ( !SWWMUtility.PointInPolyobj((x,y),p) ) continue;
inspot++;
}
if ( allspot <= 0 ) return false; // what the fuck?
if ( allspot <= 0 ) return false; // huh???
girthitude = (girthitude*inspot)/allspot;
// too fucking huge
// too huge
if ( (girthitude > 16777216) || (max(b.z-a.z,max(b.x-a.x,b.y-a.y)) > 1024) ) return false;
// not strong enough to bust
if ( bust.accdamage < girthitude/300. ) return false;
@ -497,9 +497,9 @@ Class BusterWall : Thinker
allspot++;
if ( level.PointInSector((x,y)) == hs ) inspot++;
}
if ( allspot <= 0 ) return false; // what the fuck?
if ( allspot <= 0 ) return false; // huh???
girthitude = (girthitude*inspot)/allspot;
// too fucking huge
// too huge
if ( (girthitude > 16777216) || (max(partheight,max(b.x-a.x,b.y-a.y)) > 1024) ) return false;
// not strong enough to bust
if ( bust.accdamage < girthitude/300. ) return false;

2
zscript/weapons/swwm_deathlydeathcannon_altfx.zsc
View file

@ -1127,7 +1127,7 @@ Class YnykronSingularity : SWWMNonInteractiveActor
continue;
}
// voodoo dolls just get erased (how convenient)
// otherwise instantly vaporize the fucker
// otherwise instantly vaporize the poor sap
if ( a.player && (a.player.mo != a) ) a.Destroy();
else if ( a.CountInv("GrilledCheeseSandwich") > 0 )
{

4
zscript/weapons/swwm_deathlydeathcannon_fx.zsc
View file

@ -41,7 +41,7 @@ Class AshenRemains : SWWMNonInteractiveActor
}
}
// cheap way to let players know they just got fucking erased from existence
// cheap way to let players know they just got erased from existence
Class PlayerGone : PlayerChunk
{
int deadtimer;
@ -380,7 +380,7 @@ Class YnykronImpact : SWWMNonInteractiveActor
if ( tracer )
{
// voodoo dolls just get erased (how convenient)
// otherwise instantly vaporize the fucker
// otherwise instantly vaporize the poor sap
if ( tracer.player && (tracer.player.mo != tracer) )
{
if ( tracer.pos.z < (tracer.floorz+64) )

2
zscript/weapons/swwm_shot.zsc
View file

@ -31,7 +31,7 @@ Class SpreadgunTracer : LineTracer
if ( Results.HitActor.bSHOOTABLE )
{
int amt = SWWMDamageAccumulator.GetAmount(Results.HitActor);
// getgibhealth isn't clearscope, fuck
// getgibhealth isn't clearscope and that's a problem
int gibh = (Results.HitActor.GibHealth!=int.min)?-abs(Results.HitActor.GibHealth):-int(Results.HitActor.GetSpawnHealth()*gameinfo.gibfactor);
// if gibbed, go through without dealing more damage
if ( Results.HitActor.health-amt <= gibh ) return TRACE_Skip;

2
zscript/weapons/swwm_splode.zsc
View file

@ -730,7 +730,7 @@ Class DualExplodiumGun : SWWMWeapon
}
override bool Use( bool pickup )
{
// need to override here because other mods will fuck things up
// need to override here because other mods could screw it up
if ( !SisterWeapon || (SisterWeapon.Amount < 2) )
return false;
return Super.Use(pickup);

2
zscript/weapons/swwm_weapons_hud.zsc
View file

@ -68,7 +68,7 @@ extend Class Spreadgun
}
}
// Wallbuster (less of a fuck in the alt hud)
// Wallbuster
extend Class Wallbuster
{
ui TextureID WeaponBox, RoundTex, CursorTex;