OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Cycling intermission tips and art with reload/zoom. More tips.

Browse source
This commit is contained in:
Mari the Deer 2020-11-25 23:03:56 +01:00
commit 7489a58e78
4 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
language.def_base
View file

@ -908,7 +908,7 @@ SWWM_LASTMONSTER = "\cf%s\cf killed the last monster. +%d\c-";
SWWM_NEWLORE = "New entries have been added to the Library.";
SWWM_SELLEXTRA = "\cf%s\cf sold an extra %s\cf. +%d\c-";
// intermission tips
SWWM_NINTERTIP = "75";
SWWM_NINTERTIP = "85";
SWWM_INTERTIP = "Tip #%d:";
SWWM_INTERTIP1 = "The Demolitionist is immune to drowning, poison and even fall damage (excluding instant kill pits).";
SWWM_INTERTIP2 = "The Explodium Gun's altfire has an explosive yield proportional to the bullets left in the mag.";
@ -938,7 +938,7 @@ SWWM_INTERTIP25 = "If you do an air dash straight towards the ground, you might
SWWM_INTERTIP26 = "You can press switches and open doors by punching them. This can also be done with the Lead Ball ammunition from the Spreadgun, with the exception of exit switches.";
SWWM_INTERTIP27 = "The fire from the Spreadgun's Napalm rounds will spread around to nearby enemies (or yourself). Remember, if you're on fire, stop, drop and roll... or just spin around, it works the same.";
SWWM_INTERTIP28 = "Incendiary ammunition is ineffective underwater, for obvious reasons.";
SWWM_INTERTIP29 = "Love is the most powerful thing in the world. Don't hate those who are different. We all must stand together, as humans.";
SWWM_INTERTIP29 = "Love is the most powerful thing in the world. Don't hate those who are different. We all must stand together.";
SWWM_INTERTIP30 = "The Silver Bullet fires with such a force that its bullets leave shockwaves as they rip through the air (and enemies), dealing additional damage. It can also pierce through some walls.";
SWWM_INTERTIP31 = "Going prone with the Silver Bullet will disengage the recoil compensators, allowing you to be free from their damaging heat, at the cost of mobility.";
SWWM_INTERTIP32 = "The wondrous effects of the Grilled Cheese Sandwich allow you to survive pretty much everything on auto-activation. Including even the otherwise inevitable destruction from the Ynykron Artifact!";
@ -985,6 +985,16 @@ SWWM_INTERTIP72 = "There are approximately 9.3 billion demons bred solely for wa
SWWM_INTERTIP73 = "People die if they are killed. But legends never die, they get back up and pwn you.";
SWWM_INTERTIP74 = "\"TREEEEEEEEEES!\" — Marty";
SWWM_INTERTIP75 = "Kobolds are small little creechers that go yip.";
SWWM_INTERTIP76 = "I showed you my intermission tip pls respond.";
SWWM_INTERTIP77 = "AAA gaming is rotten to the core. Support small developers whenever you can.";
SWWM_INTERTIP78 = "Xenia > Tux\n\nBring back the cool Linux fox girl. Penguins suck.";
SWWM_INTERTIP79 = "The only good nazi is a dead nazi.";
SWWM_INTERTIP80 = "Ceci n'est pas un conseil.";
SWWM_INTERTIP81 = "Age only affects appearance, and has no bearing on ability. Gender has no bearing on ability. Everyone has imperfections, prejudice births malcontents, become a dark spirit.\n\nTime for crab.";
SWWM_INTERTIP82 = "\"IF THE ZOO BANS ME FOR HOLLERING AT THE ANIMALS I WILL FACE GOD AND WALK BACKWARDS INTO HELL\" — dril";
SWWM_INTERTIP83 = "SWWM GZ is truly Some Weird Weapons Mod for GZDoom.";
SWWM_INTERTIP84 = "\"In its vastness, the universe is no more than a mere grain of sand when compared to the limitless bounds of one's imagination.\" — Zanaveth Nekuraku III";
SWWM_INTERTIP85 = "You can shuffle the intermission art with Zoom, and these tips with Reload. Holding Altfire will hide the UI so you can see the art in full.";
// intermission fanart
SWWM_FANART = "Art: ";
SWWM_NFANART = "5";

11
language.es_base
View file

@ -874,7 +874,7 @@ SWWM_INTERTIP25 = "Si haces un sprint en el aire apuntando directamente al suelo
SWWM_INTERTIP26 = "Puedes activar objetos y abrir puertas a puñetazos. Esto también se puede hacer con la munición de Bola de Plomo del Trabuco, a excepción de los botones de salida.";
SWWM_INTERTIP27 = "Las llamas de los cartuchos de Napalm del Trabuco se extenderán a otros enemigos cercanos (o a ti). Recuerda, si estás ardiendo, tírate al suelo y rueda... o ponte a dar vueltas, funciona igual.";
SWWM_INTERTIP28 = "La munición incendiaria es inefectiva bajo el agua, por razones obvias.";
SWWM_INTERTIP29 = "El amor es lo más poderoso que existe en el mundo. No odies a los que son diferentes. Todos debemos permanecer unidos, como humanos.";
SWWM_INTERTIP29 = "El amor es lo más poderoso que existe en el mundo. No odies a los que son diferentes. Todos debemos permanecer unidos.";
SWWM_INTERTIP30 = "El Silver Bullet dispara con una fuerza tal que sus balas liberan ondas de choque al atravesar el aire (y los enemigos), causando daño adicional. También puede atravesar algunas paredes.";
SWWM_INTERTIP31 = "Al tumbarte con el Silver Bullet se desacoplarán los compensadores de retroceso, librándote de su calor dañino, a costa de movilidad.";
SWWM_INTERTIP32 = "Los maravillantes efectos del Sandwich de Queso a la Parrilla te permiten sobrevivir básicamente cualquier cosa al autoactivarse. ¡Incluyendo hasta la de otra forma inevitable destrucción del Artefacto Ynykron!";
@ -919,5 +919,14 @@ SWWM_INTERTIP71 = "\"En internet nadie puede escucharte ser sutil.\" — Linus T
SWWM_INTERTIP72 = "Hay aproximadamente 9.3 mil millones de demonios criados solo para la guerra en el Infierno. Eso es ochocientas setenta y seis mil veces el conteo de monstruos de nuts.wad, y eso es terrible.";
SWWM_INTERTIP73 = "La gente muere si la matan. Pero las leyendas nunca mueren, se levantan de nuevo y te parten la badana.";
SWWM_INTERTIP75 = "Los kobolds son pequeñas criaturitas que hacen yip.";
SWWM_INTERTIP76 = "Te he enseñado mi consejo de intermisión contesta pls.";
SWWM_INTERTIP77 = "El gaming AAA está podrido hasta la médula. Apoya a los pequeños desarrolladores siempre que puedas.";
SWWM_INTERTIP78 = "Xenia > Tux\n\nDevolvednos a la chica zorro molona de Linux. Los pingüinos apestan.";
SWWM_INTERTIP79 = "El único nazi bueno es un nazi muerto.";
SWWM_INTERTIP81 = "La edad solo afecta a la apariencia, y no tiene relación a la habilidad. El género no tiene relación a la habilidad. Todo el mundo tiene imperfecciones, los prejuicios traen consigo malcontentos, conviertete en un espíritu oscuro.\n\nHora de cangrejo.";
SWWM_INTERTIP82 = "\"SI EL ZOO ME PROHIBE LA ENTRADA POR GRITAR A LOS ANIMALES HARÉ FRENTE A DIOS Y CAMINARÉ DE ESPALDAS AL INFIERNO\" — dril";
SWWM_INTERTIP83 = "SWWM GZ es realmente Un Extraño Mod de Armas (Some Weird Weapons Mod) para GZDoom.";
SWWM_INTERTIP84 = "\"En su inmensidad, el universo no es más que un mero grano de arena cuando se compara a los límites ilimitados de nuestra imaginación.\" — Zanaveth Nekuraku III";
SWWM_INTERTIP85 = "Puedes alternar el arte de intermisión con Zoom, y estos consejos con Recarga. Mantener Fuego Secundario ocultará la interfaz para que puedas ver el arte al completo.";
// intermission fanart
SWWM_FANART = "Arte: ";

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r639 \cu(Wed 25 Nov 20:45:55 CET 2020)";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r640 \cu(Wed 25 Nov 23:03:56 CET 2020)";

25
zscript/swwm_inter.zsc
View file

@ -120,6 +120,8 @@ Class SWWMStatScreen : StatusScreen abstract
if ( (i >= 61) && (i <= 68) ) continue;
ents.Push(i);
}
// account for skipped dlc tips (important, will crash otherwise)
maxtip -= 8;
if ( pdata.lasttip.Size() >= maxtip )
{
// exclude last one, start over
@ -268,10 +270,27 @@ Class SWWMStatScreen : StatusScreen abstract
if ( !playeringame[i] ) continue;
{
PlayerInfo p = players[i];
if ( (p.cmd.buttons^p.oldbuttons) && ((p.cmd.buttons&p.oldbuttons) == p.oldbuttons) && !p.Bot && (p.cmd.buttons&(BT_ATTACK|BT_USE)) )
if ( (p.cmd.buttons^p.oldbuttons) && ((p.cmd.buttons&p.oldbuttons) == p.oldbuttons) && !p.Bot )
{
acceleratestage = 1;
playerready[i] = true;
if ( p.cmd.buttons&(BT_ATTACK|BT_USE) )
{
acceleratestage = 1;
playerready[i] = true;
}
if ( i == consoleplayer )
{
if ( p.cmd.buttons&BT_RELOAD )
{
PlaySound("menu/demoscroll");
whichtip = 0;
}
if ( p.cmd.buttons&BT_ZOOM )
{
PlaySound("menu/demoscroll");
whichart = 0;
arttex.SetNull();
}
}
}
p.oldbuttons = p.buttons;
}