From f5b52dd9b050d4a8f4e09c718159ba76e71c03cf Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 23 Oct 2021 21:39:35 +0200 Subject: [PATCH] ass piss poo fart butt --- language.def_menu | 1 + language.es_menu | 1 + language.version | 4 ++-- menudef.txt | 5 +++-- zscript/items/swwm_ammospawn.zsc | 4 ++-- zscript/weapons/swwm_blazeit_fx.zsc | 8 ++++---- zscript/weapons/swwm_danmaku.zsc | 5 +++-- zscript/weapons/swwm_danmaku_fx.zsc | 5 +++-- 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/language.def_menu b/language.def_menu index 1109af80a..ccba2df07 100644 --- a/language.def_menu +++ b/language.def_menu @@ -152,6 +152,7 @@ SWWM_TRAILS_GREEN = "Green"; SWWM_TRAILS_CYAN = "Cyan"; SWWM_TRAILS_BLUE = "Blue"; SWWM_TRAILS_MAGENTA = "Magenta"; +SWWM_TRAILS_RANDOM = "Random"; SWWM_TRAILS_RAINBOW = "Rainbow"; SWWM_TRAILS_TRANS = "TRANS RIGHTS"; SWWM_PISTOLSTART = "Force Pistol Start"; diff --git a/language.es_menu b/language.es_menu index e2a2c98e8..cbcc84b92 100644 --- a/language.es_menu +++ b/language.es_menu @@ -152,6 +152,7 @@ SWWM_TRAILS_GREEN = "Verde"; SWWM_TRAILS_CYAN = "Cian"; SWWM_TRAILS_BLUE = "Azul"; SWWM_TRAILS_MAGENTA = "Magenta"; +SWWM_TRAILS_RANDOM = "Aleatorio"; SWWM_TRAILS_RAINBOW = "Arcoiris"; SWWM_PISTOLSTART = "Forzar Pistol Start"; SWWM_PISTOLSTART_MAP = "Cada Nivel"; diff --git a/language.version b/language.version index 7cafa7c9d..7217ac081 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r41 \cu(Sat 23 Oct 11:52:14 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r41 \cu(2021-10-23 11:52:14)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r42 \cu(Sat 23 Oct 21:39:35 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r42 \cu(2021-10-23 21:39:35)\c-"; diff --git a/menudef.txt b/menudef.txt index 08048d5fe..2e605a4f8 100644 --- a/menudef.txt +++ b/menudef.txt @@ -46,8 +46,9 @@ OptionValue "SWWMFunTrails" 5, "$SWWM_TRAILS_CYAN" 6, "$SWWM_TRAILS_BLUE" 7, "$SWWM_TRAILS_MAGENTA" - 8, "$SWWM_TRAILS_RAINBOW" - 9, "$SWWM_TRAILS_TRANS" + 8, "$SWWM_TRAILS_RANDOM" + 9, "$SWWM_TRAILS_RAINBOW" + 10, "$SWWM_TRAILS_TRANS" } OptionValue "SWWMDRLASkill" { diff --git a/zscript/items/swwm_ammospawn.zsc b/zscript/items/swwm_ammospawn.zsc index f5cb53281..47c3a756e 100644 --- a/zscript/items/swwm_ammospawn.zsc +++ b/zscript/items/swwm_ammospawn.zsc @@ -83,12 +83,12 @@ Class SWWMShellAmmoBig : SWWMAmmoSpawner case 1: case 2: case 3: - return 'RedShell'; + return 'RedShell2'; case 4: case 5: case 6: case 7: - return 'GreenShell'; + return 'GreenShell2'; case 8: case 9: case 10: diff --git a/zscript/weapons/swwm_blazeit_fx.zsc b/zscript/weapons/swwm_blazeit_fx.zsc index 0e96af7b6..600eb36c5 100644 --- a/zscript/weapons/swwm_blazeit_fx.zsc +++ b/zscript/weapons/swwm_blazeit_fx.zsc @@ -334,7 +334,7 @@ Class HellblazerMissile : Actor A_SetRenderStyle(1.0,STYLE_Add); A_SprayDecal("BigRocketBlast",50); A_SetScale(4.5); - SWWMUtility.DoExplosion(self,150,320000,200,90); + SWWMUtility.DoExplosion(self,200,320000,200,90); A_NoGravity(); A_QuakeEx(5,5,5,15,0,1500,"",QF_RELATIVE|QF_SCALEDOWN,falloff:500,rollIntensity:.8); A_StopSound(CHAN_BODY); @@ -431,7 +431,7 @@ Class HellblazerCrackshot : HellblazerMissile A_SetRenderStyle(1.0,STYLE_Add); A_SprayDecal("BigRocketBlast",50); A_SetScale(3.); - SWWMUtility.DoExplosion(self,120,320000,160,60); + SWWMUtility.DoExplosion(self,160,320000,160,60); A_NoGravity(); A_QuakeEx(4,4,4,12,0,1200,"",QF_RELATIVE|QF_SCALEDOWN,falloff:400,rollIntensity:.6); A_StopSound(CHAN_BODY); @@ -502,7 +502,7 @@ Class HellblazerRavager : HellblazerMissile A_SetRenderStyle(1.0,STYLE_Add); A_SprayDecal("HugeRocketBlast",50); A_SetScale(8.); - SWWMUtility.DoExplosion(self,250,320000,300,120); + SWWMUtility.DoExplosion(self,300,320000,300,120); A_NoGravity(); A_QuakeEx(6,6,6,30,0,2000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:800,rollIntensity:1.); A_StopSound(CHAN_BODY); @@ -895,7 +895,7 @@ Class HellblazerClusterMini : HellblazerMissile2 A_SetRenderStyle(1.0,STYLE_Add); A_SprayDecal("BigRocketBlast",50); A_SetScale(2.5); - SWWMUtility.DoExplosion(self,30,200000,150,60); + SWWMUtility.DoExplosion(self,50,200000,150,60); A_NoGravity(); A_QuakeEx(4,4,4,12,0,1000,"",QF_RELATIVE|QF_SCALEDOWN,falloff:400,rollIntensity:.6); A_StopSound(CHAN_BODY); diff --git a/zscript/weapons/swwm_danmaku.zsc b/zscript/weapons/swwm_danmaku.zsc index 256705ebe..4ad31f646 100644 --- a/zscript/weapons/swwm_danmaku.zsc +++ b/zscript/weapons/swwm_danmaku.zsc @@ -119,6 +119,7 @@ Class Eviscerator : SWWMWeapon [x2, y2, z2] = swwm_CoordUtil.GetAxes(BulletSlope(),angle,roll); origin = level.Vec3Offset(Vec2OffsetZ(0,0,player.viewz),10*x+4*y-5*z); int trail = CVar.GetCVar('swwm_funtrails',player).GetInt(); + if ( trail == 8 ) trail = Random[Eviscerator](1,7); for ( int i=0; i<25; i++ ) { a = FRandom[Eviscerator](0,360); @@ -131,8 +132,8 @@ Class Eviscerator : SWWMWeapon p.vel = dir*p.speed*FRandom[Eviscerator](.9,1.1); if ( invoker.extended ) p.vel *= 1.5; if ( trail < 8 ) p.trailcolor = max(0,trail); - else if ( trail == 8 ) p.trailcolor = (i%6)+2; - else if ( trail == 9 ) + else if ( trail == 9 ) p.trailcolor = (i%6)+2; + else if ( trail == 10 ) { switch ( i%5 ) { diff --git a/zscript/weapons/swwm_danmaku_fx.zsc b/zscript/weapons/swwm_danmaku_fx.zsc index 5463fbd90..9407ef34d 100644 --- a/zscript/weapons/swwm_danmaku_fx.zsc +++ b/zscript/weapons/swwm_danmaku_fx.zsc @@ -505,6 +505,7 @@ Class EvisceratorProj : Actor } int trail = 0; if ( target && target.player ) trail = CVar.GetCVar('swwm_funtrails',target.player).GetInt(); + if ( trail == 8 ) trail = Random[Eviscerator](0,7); for ( int i=0; i<25; i++ ) { p = EvisceratorChunk(Spawn("EvisceratorChunk",level.Vec3Offset(pos,spawnofs))); @@ -517,8 +518,8 @@ Class EvisceratorProj : Actor p.vel = (cos(p.angle)*cos(p.pitch),sin(p.angle)*cos(p.pitch),-sin(p.pitch))*(p.speed+FRandom[Eviscerator](-5,20)); p.target = target; if ( trail < 8 ) p.trailcolor = max(0,trail); - else if ( trail == 8 ) p.trailcolor = (i%6)+2; - else if ( trail == 9 ) + else if ( trail == 9 ) p.trailcolor = (i%6)+2; + else if ( trail == 10 ) { switch ( i%5 ) {