OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Prevent repetition of intermission art/tips. Add 10 more tips.

Browse source
This commit is contained in:
Mari the Deer 2020-09-15 14:11:49 +02:00
commit 5fc9041fc4
4 changed files with 111 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
language.def_base
View file

@ -849,7 +849,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 = "30";
SWWM_NINTERTIP = "40";
SWWM_INTERTIP = "Tip #%d:";
SWWM_INTERTIP1 = "The Demolitionist is immune to drowning, poison and even fall damage (excluding instant kill pits, e.g. in Hexen).";
SWWM_INTERTIP2 = "The Explodium Gun's altfire has an explosive yield proportional to the bullets left in the mag.";
@ -861,8 +861,8 @@ SWWM_INTERTIP7 = "True to its name, the Wallbuster can be used to completely obl
SWWM_INTERTIP8 = "The Eviscerator can easily clear entire rooms and corridors, but keep in mind that some of the shrapnel might bounce right back at you if you're not careful.";
SWWM_INTERTIP9 = "When on the move, the Silver Bullet's jet compensators will reduce most of the recoil from firing, but will also deal some damage if you're not wearing armor.";
SWWM_INTERTIP10 = "Just like other energy weapons of similar function, the Sparkster's primary and secondary fires can be combined with deadly results.";
SWWM_INTERTIP11 = "The Lämp has a chance to attract a rare type of moth that is much more aggressive than others in its attacks.";
SWWM_INTERTIP12 = "Most healing items will auto-activate if you're about to die, though sometimes they may not be enough to really save you... unless it's a Grilled Cheese Sandwich.";
SWWM_INTERTIP11 = "The Lämp has a chance to attract a rare type of moth that is much more aggressive than others in its attacks. It is easily recognizable by its white color and bigger size.";
SWWM_INTERTIP12 = "The Refresher will always auto-activate if you're about to die, though sometimes they may not be enough to really save you...";
SWWM_INTERTIP13 = "The Ynykron Artifact will instantly kill everything you aim it at, unless it's really unkillable, though usually that's only the case for gods. You're not planning on going after any gods, right?";
SWWM_INTERTIP14 = "Do not be deceived by the Candy Gun, it may seem like a simple recolor, but it is A LOT stronger than your starting weapon.";
SWWM_INTERTIP15 = "The Ragekit will greatly increase the strength of your melee attacks and reduce incoming damage, but it'll also make you scream, all the time.";
@ -881,6 +881,16 @@ SWWM_INTERTIP27 = "The fire from the Spreadgun's Napalm rounds will spread aroun
SWWM_INTERTIP28 = "Incendiary ammunition is ineffective underwater, for obvious reasons.";
SWWM_INTERTIP29 = "My girlfriends are really cute. Sorry, I had to say it.";
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!";
SWWM_INTERTIP33 = "If you can line it up properly, dashing into enemies backwards will deal triple damage, due to certain specifics of your chassis.\n\n(Yes, I'm referring to that shiny metal butt)";
SWWM_INTERTIP34 = "While under the effects of a Ragekit, your dashing damage will be amplified to such a level you can even cleanly tear through doors and other obstacles along the way.";
SWWM_INTERTIP35 = "Trans rights are human rights.";
SWWM_INTERTIP36 = "Demo-chan's favorite color is green.";
SWWM_INTERTIP37 = "Kinylum saltshot is potent enough to pierce through invulnerable enemies. This is also true of all weapons from slot 6 upwards.";
SWWM_INTERTIP38 = "Even if you're not interested in reading the lore, it is still useful to check the entries of weapons and other items to learn more about their usage. Of course, you can also simply experiment by yourself.";
SWWM_INTERTIP39 = "If you experience slowdowns when many sound effects are playing, it's recommended to disable HRTF in the OpenAL settings, if enabled.";
SWWM_INTERTIP40 = "Item Sense can help you detect items that would be otherwise hard to see among the chaos of an after-battle corpse pile. With an Omnisight, you can even see where items are through walls!";
// intermission fanart
SWWM_FANART = "Art: ";
SWWM_NFANART = "4";

14
language.es_base
View file

@ -802,8 +802,8 @@ SWWM_INTERTIP7 = "Tal como su nombre indica, la Wallbuster puede cargarse parede
SWWM_INTERTIP8 = "El Eviscerator puede despejar salas y pasillos enteros, pero ten en cuenta que los fragmentos pueden rebotarte de vuelta si no tienes cuidado.";
SWWM_INTERTIP9 = "Mientras caminas, los jets compensadores del Silver Bullet reducirán la mayoría del retroceso al disparar, pero puede que hagan algo de daño si no llevas armadura.";
SWWM_INTERTIP10 = "Al igual que otras armas de energía de funcionamiento similar, los fuegos primario y secundario del Sparkster se pueden combinar con resultados letales.";
SWWM_INTERTIP11 = "La Lämpara puede atraer un tipo poco común de polilla que es mucho más agresiva que otras en sus ataques.";
SWWM_INTERTIP12 = "La mayoría de items de salud se autoactivan si estás a punto de morir, aunque a veces puede que no sea suficiente para salvarte... A menos que sea un Sandwich de Queso a la Plancha.";
SWWM_INTERTIP11 = "La Lämpara puede atraer un tipo poco común de polilla que es mucho más agresiva que otras en sus ataques. Se reconoce fácilmente por su color blanco y mayor tamaño.";
SWWM_INTERTIP12 = "El Refrescador siempre se autoactivará si estás a punto de morir, aunque a veces puede que no sea suficiente para salvarte...";
SWWM_INTERTIP13 = "El Artefacto Ynykron mata instantáneamente todo lo que tengas en el punto de mira, a menos que sea realmente indestructible, aunque normalmente eso solo puede ser si es un dios. ¿No estarás pensando en enfrentarte a algún dios, verdad?";
SWWM_INTERTIP14 = "No te dejes engañar por la Pistola Caramelo, puede parecer solo un recoloreado, pero es MUCHO MÁS fuerte que tu arma inicial.";
SWWM_INTERTIP15 = "El Ragekit potenciará enormemente la fuerza de tus ataques a melé y reducirá el daño recibido, pero también te hará gritar, todo el rato.";
@ -822,6 +822,16 @@ SWWM_INTERTIP27 = "Las llamas de los cartuchos de Napalm del Trabuco se extender
SWWM_INTERTIP28 = "La munición incendiaria es inefectiva bajo el agua, por razones obvias.";
SWWM_INTERTIP29 = "Mis novias son muy cuquis. Lo siento, es que tenía que decirlo.";
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 basicamentecualquier cosa al autoactivarse. ¡Incluyendo hasta la de otra forma inevitable destrucción del Artefacto Ynykron!";
SWWM_INTERTIP33 = "Si puedes alinearte correctamente, esprintar hacia atrás hará que los enemigos reciban daño triple, debido a ciertas características de tu chasis.\n\n(Sí, me refiero a ese brillante y metálico trasero)";
SWWM_INTERTIP34 = "Bajo los efectos de un Ragekit, tu daño al esprintar será amplificado hasta un nivel tal que puedes incluso atravesar limpiamente puertas y otros obstáculos por el camino.";
SWWM_INTERTIP35 = "Los derechos trans son derechos humanos.";
SWWM_INTERTIP36 = "El color favorito de Demo-chan es el verde.";
SWWM_INTERTIP37 = "Los perdigones de sal de Kinylum son suficientemente potentes como para atravesar la invulnerabilidad de algunos enemigos. Esto es tambien cierto para todas las armas del puesto 6 en adelante.";
SWWM_INTERTIP38 = "Aunque no te interese leer el lore, sigue siendo util comprobar las entradas de armas y otros items para aprender más sobre su uso. Por supuesto, tambien puedes simplemente experimentar por tu cuenta.";
SWWM_INTERTIP39 = "Si notas bajones cuando hay muchos efectos de sonido activos, se recomienda desactivar el HRTF en las opciones de OpenAL, si está activado.";
SWWM_INTERTIP40 = "El Sensor de Items puede ayudar a detectar items que de otro modo serían difíciles de ver entre el caos de pilas de cuerpos tras una batalla. ¡Con una Omnivisión, puedes incluso ver donde hay items a través de las paredes!";
// intermission fanart
SWWM_FANART = "Arte: ";
// intermission 4komas (TBD)

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r546 (Mon 14 Sep 15:02:02 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r547 (Tue 15 Sep 14:11:49 CEST 2020)";

89
zscript/swwm_inter.zsc
View file

@ -1,4 +1,9 @@
// Custom intermission screens
Class SWWMStatScreenData : Thinker
{
// to prevent repetition
Array<int> lasttip, lastart, last4koma;
}
Class SWWMStatScreen : StatusScreen abstract
{
@ -25,12 +30,67 @@ Class SWWMStatScreen : StatusScreen abstract
private void drawSWWMBg()
{
if ( !intertype ) intertype = CVar.GetCVar('swwm_intertype',players[consoleplayer]);
let pdata = SWWMStatScreenData(ThinkerIterator.Create("SWWMStatScreenData",Thinker.STAT_STATIC).Next());
if ( !pdata )
{
pdata = new("SWWMStatScreenData");
pdata.ChangeStatNum(Thinker.STAT_STATIC);
}
if ( !whichart )
{
int no = 0;
if ( intertype.GetInt() == 1 ) no = StringTable.Localize("$SWWM_NFANART").ToInt();
//else if ( intertype.GetInt() == 2 ) no = StringTable.Localize("$SWWM_N4KOMA").ToInt();
whichart = Random[InterArt](1,no);
if ( intertype.GetInt() == 1 )
{
no = StringTable.Localize("$SWWM_NFANART").ToInt();
Array<Int> ents;
ents.Clear();
for ( int i=1; i<=no; i++ )
ents.Push(i);
if ( pdata.lastart.Size() >= no )
{
// exclude last one, start over
int excludeme = pdata.lastart[pdata.lastart.Size()-1];
ents.Delete(excludeme-1);
pdata.lastart.Clear();
}
else
{
for ( int i=0; i<pdata.lastart.Size(); i++ )
{
int f = ents.Find(pdata.lastart[i]);
if ( f != ents.Size() )
ents.Delete(f);
}
}
whichart = ents[Random[InterArt](0,ents.Size()-1)];
pdata.lastart.Push(whichart);
}
else if ( intertype.GetInt() == 2 )
{
no = StringTable.Localize("$SWWM_N4KOMA").ToInt();
Array<Int> ents;
ents.Clear();
for ( int i=1; i<=no; i++ )
ents.Push(i);
if ( pdata.last4koma.Size() >= no )
{
// exclude last one, start over
int excludeme = pdata.last4koma[pdata.last4koma.Size()-1];
ents.Delete(excludeme-1);
pdata.last4koma.Clear();
}
else
{
for ( int i=0; i<pdata.last4koma.Size(); i++ )
{
int f = ents.Find(pdata.last4koma[i]);
if ( f != ents.Size() )
ents.Delete(f);
}
}
whichart = ents[Random[InterArt](0,ents.Size()-1)];
pdata.last4koma.Push(whichart);
}
}
if ( !bgtex ) bgtex = TexMan.CheckForTexture("graphics/InterBG.png",TexMan.Type_MiscPatch);
double ar = Screen.GetAspectRatio();
@ -68,7 +128,28 @@ Class SWWMStatScreen : StatusScreen abstract
if ( !whichtip )
{
int maxtip = StringTable.Localize("$SWWM_NINTERTIP").ToInt();
whichtip = Random[InterArt](1,maxtip);
Array<Int> ents;
ents.Clear();
for ( int i=1; i<=maxtip; i++ )
ents.Push(i);
if ( pdata.lasttip.Size() >= maxtip )
{
// exclude last one, start over
int excludeme = pdata.lasttip[pdata.lasttip.Size()-1];
ents.Delete(excludeme-1);
pdata.lasttip.Clear();
}
else
{
for ( int i=0; i<pdata.lasttip.Size(); i++ )
{
int f = ents.Find(pdata.lasttip[i]);
if ( f != ents.Size() )
ents.Delete(f);
}
}
whichtip = ents[Random[InterArt](0,ents.Size()-1)];
pdata.lasttip.Push(whichtip);
}
String tipstr = "\cd"..String.Format(StringTable.Localize("$SWWM_INTERTIP"),whichtip).."\c-\n"..StringTable.Localize(String.Format("$SWWM_INTERTIP%d",whichtip));
BrokenLines l = fnt.BreakLines(tipstr,300);