diff --git a/language.def_menu b/language.def_menu index 45a9f1404..75fa23247 100644 --- a/language.def_menu +++ b/language.def_menu @@ -105,6 +105,9 @@ SWWM_TRAILS_MAGENTA = "Magenta"; SWWM_TRAILS_RANDOM = "Random"; SWWM_TRAILS_RAINBOW = "Rainbow"; SWWM_TRAILS_TRANS = "TRANS RIGHTS"; +SWWM_TRAILS_DOSE = "Thanks, Doc"; +SWWM_TRAILS_CACO = "FIREBLU"; +SWWM_TRAILS_XMAS = "Christmas"; SWWM_PS_FULLRESET = "Pistol Start"; SWWM_PS_RESETAMMO = "Reset Ammo"; SWWM_PS_RESETITEMS = "Reset Items"; diff --git a/language.es_menu b/language.es_menu index 84f21e1e3..fa686bfc5 100644 --- a/language.es_menu +++ b/language.es_menu @@ -102,6 +102,8 @@ SWWM_TRAILS_BLUE = "Azul"; SWWM_TRAILS_MAGENTA = "Magenta"; SWWM_TRAILS_RANDOM = "Aleatorio"; SWWM_TRAILS_RAINBOW = "Arcoiris"; +SWWM_TRAILS_DOSE = "Gracias, Doc"; +SWWM_TRAILS_XMAS = "Navidad"; SWWM_PS_FULLRESET = "Reseteo Completo"; SWWM_PS_RESETAMMO = "Resetear Munición"; SWWM_PS_RESETITEMS = "Resetear Ítems"; diff --git a/language.version b/language.version index f03eb2f7b..0a44f54ae 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1025 \cu(Mon 27 Nov 15:44:23 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1025 \cu(2023-11-27 15:44:23)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1026 \cu(Mon 27 Nov 16:04:44 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1026 \cu(2023-11-27 16:04:44)\c-"; diff --git a/menudef.txt b/menudef.txt index ee722fcf1..e4bd826f7 100644 --- a/menudef.txt +++ b/menudef.txt @@ -43,6 +43,9 @@ OptionValue "SWWMFunTrails" 8, "$SWWM_TRAILS_RANDOM" 9, "$SWWM_TRAILS_RAINBOW" 10, "$SWWM_TRAILS_TRANS" + 11, "$SWWM_TRAILS_DOSE" + 12, "$SWWM_TRAILS_CACO" + 13, "$SWWM_TRAILS_XMAS" } OptionValue "SWWMDRLASkill" { diff --git a/zscript/dlc1/swwm_heavymahsheengun.zsc b/zscript/dlc1/swwm_heavymahsheengun.zsc index 9165d51e5..7e8a4bbc6 100644 --- a/zscript/dlc1/swwm_heavymahsheengun.zsc +++ b/zscript/dlc1/swwm_heavymahsheengun.zsc @@ -225,19 +225,39 @@ Class HeavyMahSheenGun : SWWMWeapon trail = invoker.tcol; } else if ( trail == 9 ) trail = 2+(invoker.shotcnt%6); - else if ( trail == 10 ) switch ( invoker.shotcnt%5 ) + else if ( trail == 10 ) { - case 0: - case 3: - trail = 8; - break; - case 1: - case 4: - trail = 9; - break; - case 2: - trail = 1; - break; + switch ( invoker.shotcnt%5 ) + { + case 0: + case 3: + trail = 8; + break; + case 1: + case 4: + trail = 9; + break; + case 2: + trail = 1; + break; + } + } + else if ( trail == 11 ) trail = (invoker.shotcnt&1)?7:4; + else if ( trail == 12 ) trail = (invoker.shotcnt&1)?6:2; + else if ( trail == 13 ) + { + switch ( invoker.shotcnt%3 ) + { + case 0: + trail = 2; + break; + case 1: + trail = 1; + break; + case 2: + trail = 4; + break; + } } let t = Spawn("SheenTrail",origin); t.target = self; diff --git a/zscript/weapons/swwm_danmaku.zsc b/zscript/weapons/swwm_danmaku.zsc index c4193a1bf..c40405090 100644 --- a/zscript/weapons/swwm_danmaku.zsc +++ b/zscript/weapons/swwm_danmaku.zsc @@ -104,7 +104,7 @@ Class Eviscerator : SWWMWeapon else if ( trail == 9 ) p.trailcolor = (i%6)+2; else if ( trail == 10 ) { - switch ( i%6 ) + switch ( i%5 ) { case 0: case 3: @@ -119,6 +119,23 @@ Class Eviscerator : SWWMWeapon break; } } + else if ( trail == 11 ) p.trailcolor = (i&1)?7:4; + else if ( trail == 12 ) p.trailcolor = (i&1)?6:2; + else if ( trail == 13 ) + { + switch ( i%3 ) + { + case 0: + p.trailcolor = 2; + break; + case 1: + p.trailcolor = 1; + break; + case 2: + p.trailcolor = 4; + break; + } + } } for ( int i=0; i<8; i++ ) { diff --git a/zscript/weapons/swwm_danmaku_fx.zsc b/zscript/weapons/swwm_danmaku_fx.zsc index 9bc881b56..f82d731a4 100644 --- a/zscript/weapons/swwm_danmaku_fx.zsc +++ b/zscript/weapons/swwm_danmaku_fx.zsc @@ -460,7 +460,7 @@ Class EvisceratorProj : Actor else if ( trail == 9 ) p.trailcolor = (i%6)+2; else if ( trail == 10 ) { - switch ( i%6 ) + switch ( i%5 ) { case 0: case 3: @@ -475,6 +475,23 @@ Class EvisceratorProj : Actor break; } } + else if ( trail == 11 ) p.trailcolor = (i&1)?7:4; + else if ( trail == 12 ) p.trailcolor = (i&1)?6:2; + else if ( trail == 13 ) + { + switch ( i%3 ) + { + case 0: + p.trailcolor = 2; + break; + case 1: + p.trailcolor = 1; + break; + case 2: + p.trailcolor = 4; + break; + } + } } int numpt = Random[Eviscerator](10,15); for ( int i=0; i