From a2f245b189f3657ebb3a5bfbef7a77779508617f Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Fri, 17 Mar 2023 13:25:54 +0100 Subject: [PATCH] More stuff I missed. --- acs/swwmcomp.o | Bin 1112 -> 1116 bytes language.def_base | 2 +- language.es_base | 2 +- language.es_lore | 2 -- language.version | 4 ++-- lore/es/saya.txt | 2 -- swwmcomp.acs | 2 +- zscript/compat/swwm_compat.zsc | 6 +++--- zscript/compat/swwm_hdoom.zsc | 14 +++++++------- zscript/compat/swwm_shame.zsc | 10 +++++----- zscript/handler/swwm_handler.zsc | 4 ++-- zscript/handler/swwm_handler_damage.zsc | 2 +- zscript/handler/swwm_handler_debugrender.zsc | 4 ++-- zscript/handler/swwm_handler_iwantdie.zsc | 6 +++--- zscript/handler/swwm_handler_process.zsc | 2 +- zscript/handler/swwm_handler_worldload.zsc | 4 ++-- zscript/handler/swwm_handler_worldthings.zsc | 2 +- zscript/handler/swwm_statichandler.zsc | 14 +++++++------- .../swwm_statichandler_achievements.zsc | 2 +- zscript/hud/swwm_hud_topstuff.zsc | 2 +- zscript/hud/swwm_hudextra.zsc | 6 +++--- zscript/items/swwm_ammoextra.zsc | 2 +- zscript/menu/swwm_inter.zsc | 2 +- zscript/menu/swwm_menus.zsc | 4 ++-- zscript/player/swwm_player.zsc | 2 +- zscript/swwm_common.zsc | 4 ++-- zscript/swwm_common_fx.zsc | 2 +- zscript/swwm_thinkers.zsc | 2 +- zscript/utility/swwm_utility.zsc | 2 +- zscript/utility/swwm_utility_compat.zsc | 2 +- zscript/utility/swwm_utility_info.zsc | 4 ++-- zscript/weapons/swwm_cbt_fx.zsc | 8 ++++---- .../weapons/swwm_deathlydeathcannon_altfx.zsc | 2 +- .../weapons/swwm_deathlydeathcannon_fx.zsc | 4 ++-- zscript/weapons/swwm_shot.zsc | 2 +- zscript/weapons/swwm_splode.zsc | 2 +- zscript/weapons/swwm_weapons_hud.zsc | 2 +- 37 files changed, 67 insertions(+), 71 deletions(-) diff --git a/acs/swwmcomp.o b/acs/swwmcomp.o index e7af79370e988042abf4e967fd3a8ac49e499691..2610342b49687582ddefba9be5b07ec92da5fdf1 100644 GIT binary patch delta 51 zcmcb?afgG|(K(nQWFu=c6XTM}olMf4Wef}qtqcqdlP9lb@@EZp4ss2j#H_=_z_3}H HS(gz2Y0eCh delta 48 zcmcb^af5@^(K(nQU?XcY6XSx(olMf4r3?%VEes3{lP0fa@@H`ib@raj$gH#3fLVtT E07E|vE&u=k diff --git a/language.def_base b/language.def_base index add56ff0c..fd97af406 100644 --- a/language.def_base +++ b/language.def_base @@ -997,7 +997,7 @@ SWWM_INTERTIP104 = "You can interact with collectible items from the Keychain ta SWWM_INTERTIP105 = "Moths like lamps."; SWWM_INTERTIP106 = "No, covering yourself in oil won't allow you to fly when it rains."; SWWM_INTERTIP107 = "\"I didn't know they put Shakespeare in comic books.\"\n — Demo Miyamoto"; -SWWM_INTERTIP108 = "This mod may contain horny, in small amounts."; +SWWM_INTERTIP108 = "This mod contains shiny metal butts."; SWWM_INTERTIP109 = "The Hellblazer's missiles don't just deal direct blast damage, but also release an expanding wave of scorching heat."; SWWM_INTERTIP110 = "If you didn't know already, the mod can also be used with Heretic and Hexen. New things will be unlocked in each of them, as the overarching story of the mod progresses."; SWWM_INTERTIP111 = "Ironic shitposting is still shitposting."; diff --git a/language.es_base b/language.es_base index 59409e986..e5fba2851 100644 --- a/language.es_base +++ b/language.es_base @@ -874,7 +874,7 @@ SWWM_INTERTIP104 = "Puedes interactuar con ítems coleccionables desde la pesta SWWM_INTERTIP105 = "A las polillas les gustan las lámparas."; SWWM_INTERTIP106 = "No, cubrirte de aceite no te permitirá volar cuando llueve."; SWWM_INTERTIP107 = "\"No sabía que hubieran metido a Shakespeare en los comics.\"\n — Demo Miyamoto"; -SWWM_INTERTIP108 = "Este mod puede contener horny, en pequeñas cantidades."; +SWWM_INTERTIP108 = "Este mod contiene brillantes traseros metálicos."; SWWM_INTERTIP109 = "Los misiles del Hellblazer no solo causan daño directo al explotar, si no que también liberan una onda expansiva de calor abrasador."; SWWM_INTERTIP110 = "Si no lo sabías ya, el mod puede ser usado también con Heretic y Hexen. Cosas nuevas serán desbloqueadas en cada uno, a medida que progresa la historia principal del mod."; SWWM_INTERTIP111 = "El shitposting irónico sigue siendo shitposting."; diff --git a/language.es_lore b/language.es_lore index c3408a515..8eaea4454 100644 --- a/language.es_lore +++ b/language.es_lore @@ -3328,8 +3328,6 @@ SWWM_LORETXT_SAYA = "\n" "La forma de hablar de Saya es más bien tosca en ocasiones, y se sabe que usa casualmente expresiones groseras con regularidad en medio de una conversación. Es uno de sus muchos malos hábitos de los cuales tiene dificultades para corregir, y esto ha resultado en múltiples malentendidos y situaciones embarazosas. Aun así, siempre se disculpa immediatamente si se le llama la atención.\n" "\n" -"Saya es conocida también por ser exageradamente coqueta con mujeres atractivas, algo que ha resultado en muchos malentendidos y momentos incómodos. Con orgullo suele decir que está \"siempre horny on main\", y nunca deja pasar la oportunidad de flirtear con alguien. Sin embargo si menciona que este flirteo abierto es \"sólo amistoso, entre amigos\".\n" -"\n" "Saya tiene muchos hobbies, incluyendo la programación (su lenguaje preferido siendo \cfHaskell\c-), coleccionar videojuegos (la mayoría sin jugarlos), dibujar, modelar en 3D y escribir. Su fascinación por el anime y manga la llevó a escribir el suyo propio: una serie de tres volúmenes llamada \cfMi Novia Es Una Sirvienta Robot\c-, basado parcialmente en sus experiencias saliendo con \cfMeido Miyamoto\c-. Se hizo tan popular que consiguió tener su propia adaptación al anime años después. Saya también escribió una novela de ciencia ficción, \cfEl Proyecto Akari\c-, una historia sobre experimentos de teletransporte y viajes interdimensionales \"que no se va a la mierda como el resto\". Tras el desastre en las bases de la \cfUAC\c- en cuanto a teletransporte, anunció que deseaba hacer real el Proyecto Akari, \"solo para joder a esos idiotas\".\n" "\n" "\cxNotas de Saya:\c-\n" diff --git a/language.version b/language.version index ee87a9cf4..1b4fc6bec 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r797 \cu(Fri 17 Mar 13:30:34 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r797 \cu(2023-03-17 13:30:34)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r798 \cu(Fri 17 Mar 13:31:10 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r798 \cu(2023-03-17 13:31:10)\c-"; diff --git a/lore/es/saya.txt b/lore/es/saya.txt index 3e9fde404..e7e6aa5ac 100644 --- a/lore/es/saya.txt +++ b/lore/es/saya.txt @@ -21,8 +21,6 @@ Saya recibiría frecuentemente el apodo de **No-Tomoko** en las redes, en refere La forma de hablar de Saya es más bien tosca en ocasiones, y se sabe que usa casualmente expresiones groseras con regularidad en medio de una conversación. Es uno de sus muchos malos hábitos de los cuales tiene dificultades para corregir, y esto ha resultado en múltiples malentendidos y situaciones embarazosas. Aun así, siempre se disculpa immediatamente si se le llama la atención. -Saya es conocida también por ser exageradamente coqueta con mujeres atractivas, algo que ha resultado en muchos malentendidos y momentos incómodos. Con orgullo suele decir que está "siempre horny on main", y nunca deja pasar la oportunidad de flirtear con alguien. Sin embargo si menciona que este flirteo abierto es "sólo amistoso, entre amigos". - Saya tiene muchos hobbies, incluyendo la programación (su lenguaje preferido siendo **Haskell**), coleccionar videojuegos (la mayoría sin jugarlos), dibujar, modelar en 3D y escribir. Su fascinación por el anime y manga la llevó a escribir el suyo propio: una serie de tres volúmenes llamada **Mi Novia Es Una Sirvienta Robot**, basado parcialmente en sus experiencias saliendo con **Meido Miyamoto**. Se hizo tan popular que consiguió tener su propia adaptación al anime años después. Saya también escribió una novela de ciencia ficción, **El Proyecto Akari**, una historia sobre experimentos de teletransporte y viajes interdimensionales "que no se va a la mierda como el resto". Tras el desastre en las bases de la **UAC** en cuanto a teletransporte, anunció que deseaba hacer real el Proyecto Akari, "solo para joder a esos idiotas". \cxNotas de Saya:\c- diff --git a/swwmcomp.acs b/swwmcomp.acs index 2e7e67242..ad3dccbd3 100644 --- a/swwmcomp.acs +++ b/swwmcomp.acs @@ -30,7 +30,7 @@ SCRIPT "EQUINOX_BRAINCRUSH" ( int tag ) Ceiling_CrushAndRaiseDist(tag,8,8,10); } -SCRIPT "DVACATION_UNFUCK" ( void ) +SCRIPT "DVACATION_UNSCREW" ( void ) { Delay(1); SetLineSpecial(2,ACS_ExecuteAlways,StrArg("DVACATION_EXIT")); diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc index dfd5f7d5b..18af2caa7 100644 --- a/zscript/compat/swwm_compat.zsc +++ b/zscript/compat/swwm_compat.zsc @@ -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= 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++; } diff --git a/zscript/compat/swwm_shame.zsc b/zscript/compat/swwm_shame.zsc index 2a6b00d7c..72ecd32c5 100644 --- a/zscript/compat/swwm_shame.zsc +++ b/zscript/compat/swwm_shame.zsc @@ -47,7 +47,7 @@ Class SWWMBrutalHandler : StaticEventHandler "\cx┃ \cfand trust me, it's better this way. \cx┃\c-\n" "\cx┃ \cf \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++; diff --git a/zscript/handler/swwm_handler.zsc b/zscript/handler/swwm_handler.zsc index 097a5d263..b17a53c77 100644 --- a/zscript/handler/swwm_handler.zsc +++ b/zscript/handler/swwm_handler.zsc @@ -111,7 +111,7 @@ Class SWWMHandler : EventHandler { String dat = Wads.ReadLump(lmp); Array 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 list; - // fucking Windows + // Windows pls dat.Replace("\r",""); list.Clear(); dat.Split(list,"\n"); diff --git a/zscript/handler/swwm_handler_damage.zsc b/zscript/handler/swwm_handler_damage.zsc index 527ab9fe9..a0e853cef 100644 --- a/zscript/handler/swwm_handler_damage.zsc +++ b/zscript/handler/swwm_handler_damage.zsc @@ -287,7 +287,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 ) diff --git a/zscript/handler/swwm_handler_debugrender.zsc b/zscript/handler/swwm_handler_debugrender.zsc index 2b9d501c4..372bd47b3 100644 --- a/zscript/handler/swwm_handler_debugrender.zsc +++ b/zscript/handler/swwm_handler_debugrender.zsc @@ -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.; @@ -40,7 +40,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.; diff --git a/zscript/handler/swwm_handler_iwantdie.zsc b/zscript/handler/swwm_handler_iwantdie.zsc index 990a0df1e..d603e69e2 100644 --- a/zscript/handler/swwm_handler_iwantdie.zsc +++ b/zscript/handler/swwm_handler_iwantdie.zsc @@ -1,9 +1,9 @@ // I WANT DIE -// fuck +// tokens Class DontDuplicate : Inventory {} Class DontDuplicate2 : Inventory {} -Class HOLYCOWIMTOTALLYGOINGSOFASTOHFUCK : Inventory +Class GOTTAGOFAST : Inventory { override void DoEffect() { @@ -48,7 +48,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 diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index 6b6651a34..1114680af 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -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' ) diff --git a/zscript/handler/swwm_handler_worldload.zsc b/zscript/handler/swwm_handler_worldload.zsc index b084ac72c..ffc133c30 100644 --- a/zscript/handler/swwm_handler_worldload.zsc +++ b/zscript/handler/swwm_handler_worldload.zsc @@ -281,10 +281,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; diff --git a/zscript/handler/swwm_handler_worldthings.zsc b/zscript/handler/swwm_handler_worldthings.zsc index bac90f647..ef7ef9189 100644 --- a/zscript/handler/swwm_handler_worldthings.zsc +++ b/zscript/handler/swwm_handler_worldthings.zsc @@ -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 diff --git a/zscript/handler/swwm_statichandler.zsc b/zscript/handler/swwm_statichandler.zsc index 7c0364271..811fbabb1 100644 --- a/zscript/handler/swwm_statichandler.zsc +++ b/zscript/handler/swwm_statichandler.zsc @@ -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 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 ) { diff --git a/zscript/handler/swwm_statichandler_achievements.zsc b/zscript/handler/swwm_statichandler_achievements.zsc index 701e02179..d20ff88d7 100644 --- a/zscript/handler/swwm_statichandler_achievements.zsc +++ b/zscript/handler/swwm_statichandler_achievements.zsc @@ -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"); diff --git a/zscript/hud/swwm_hud_topstuff.zsc b/zscript/hud/swwm_hud_topstuff.zsc index 467b62f52..b4cca02d3 100644 --- a/zscript/hud/swwm_hud_topstuff.zsc +++ b/zscript/hud/swwm_hud_topstuff.zsc @@ -868,7 +868,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) ) diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index 77aa1fd64..80d40a7e4 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -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 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"); diff --git a/zscript/items/swwm_ammoextra.zsc b/zscript/items/swwm_ammoextra.zsc index 8d9c76845..a4130b16c 100644 --- a/zscript/items/swwm_ammoextra.zsc +++ b/zscript/items/swwm_ammoextra.zsc @@ -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 ) diff --git a/zscript/menu/swwm_inter.zsc b/zscript/menu/swwm_inter.zsc index b1d76b2fd..0c90af3e1 100644 --- a/zscript/menu/swwm_inter.zsc +++ b/zscript/menu/swwm_inter.zsc @@ -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(); } } diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc index 16d4221ed..864644e59 100644 --- a/zscript/menu/swwm_menus.zsc +++ b/zscript/menu/swwm_menus.zsc @@ -958,8 +958,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 { diff --git a/zscript/player/swwm_player.zsc b/zscript/player/swwm_player.zsc index 5ebb7f0d3..70ab530df 100644 --- a/zscript/player/swwm_player.zsc +++ b/zscript/player/swwm_player.zsc @@ -591,7 +591,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; diff --git a/zscript/swwm_common.zsc b/zscript/swwm_common.zsc index ccf4c382f..f706d5090 100644 --- a/zscript/swwm_common.zsc +++ b/zscript/swwm_common.zsc @@ -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 diff --git a/zscript/swwm_common_fx.zsc b/zscript/swwm_common_fx.zsc index 36badc031..4dc8a3002 100644 --- a/zscript/swwm_common_fx.zsc +++ b/zscript/swwm_common_fx.zsc @@ -1196,7 +1196,7 @@ Class SWWMBulletTrail : LineTracer t.Trace(pos,level.PointInSector(pos.xy),dir,dist,0,ignore:target); 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); } diff --git a/zscript/swwm_thinkers.zsc b/zscript/swwm_thinkers.zsc index ed4b812eb..8255ad465 100644 --- a/zscript/swwm_thinkers.zsc +++ b/zscript/swwm_thinkers.zsc @@ -1,7 +1,7 @@ // various stat tracking thinkers and others // Korax instakill handler -Class UglyBoyGetsFuckedUp : Thinker +Class KoraxYeeted : Thinker { bool wedone; diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index e16ba5852..7fa10430c 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -10,7 +10,7 @@ Class SWWMUtility if ( lmp == -1 ) ThrowAbortException("'cvarinfo.base' not found"); String dat = Wads.ReadLump(lmp); Array list, ln; - // fucking Windows + // Windows pls dat.Replace("\r",""); list.Clear(); dat.Split(list,"\n"); diff --git a/zscript/utility/swwm_utility_compat.zsc b/zscript/utility/swwm_utility_compat.zsc index 660517bc9..8beae7ecf 100644 --- a/zscript/utility/swwm_utility_compat.zsc +++ b/zscript/utility/swwm_utility_compat.zsc @@ -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 list; list.Clear(); diff --git a/zscript/utility/swwm_utility_info.zsc b/zscript/utility/swwm_utility_info.zsc index c37319d49..d861c5813 100644 --- a/zscript/utility/swwm_utility_info.zsc +++ b/zscript/utility/swwm_utility_info.zsc @@ -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 i ) { if ( i is 'MagAmmo' ) return StringTable.Localize("$T_"..GetDefaultByType((Class)(i)).PickupTag.."S"); diff --git a/zscript/weapons/swwm_cbt_fx.zsc b/zscript/weapons/swwm_cbt_fx.zsc index 584fa80d1..342abd42b 100644 --- a/zscript/weapons/swwm_cbt_fx.zsc +++ b/zscript/weapons/swwm_cbt_fx.zsc @@ -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; diff --git a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc index 25532c086..0428b41e5 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_altfx.zsc @@ -1119,7 +1119,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 ) { diff --git a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc index c3b70996f..45accfc6a 100644 --- a/zscript/weapons/swwm_deathlydeathcannon_fx.zsc +++ b/zscript/weapons/swwm_deathlydeathcannon_fx.zsc @@ -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) ) diff --git a/zscript/weapons/swwm_shot.zsc b/zscript/weapons/swwm_shot.zsc index 595e0318c..fb4a8e30d 100644 --- a/zscript/weapons/swwm_shot.zsc +++ b/zscript/weapons/swwm_shot.zsc @@ -29,7 +29,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; diff --git a/zscript/weapons/swwm_splode.zsc b/zscript/weapons/swwm_splode.zsc index a1549fc83..6ad77c796 100644 --- a/zscript/weapons/swwm_splode.zsc +++ b/zscript/weapons/swwm_splode.zsc @@ -762,7 +762,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); diff --git a/zscript/weapons/swwm_weapons_hud.zsc b/zscript/weapons/swwm_weapons_hud.zsc index d7d33c90b..2235996f1 100644 --- a/zscript/weapons/swwm_weapons_hud.zsc +++ b/zscript/weapons/swwm_weapons_hud.zsc @@ -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;