OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Additional slot 5 trail colors.

Browse source
This commit is contained in:
Mari the Deer 2023-11-27 16:04:44 +01:00
commit c35261a34f
7 changed files with 79 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
language.def_menu
View file

@ -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";

2
language.es_menu
View file

@ -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";

4
language.version
View file

@ -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-";

3
menudef.txt
View file

@ -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"
{

44
zscript/dlc1/swwm_heavymahsheengun.zsc
View file

@ -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;

19
zscript/weapons/swwm_danmaku.zsc
View file

@ -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++ )
{

19
zscript/weapons/swwm_danmaku_fx.zsc
View file

@ -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<numpt; i++ )