OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

More lore™.

Browse source
This commit is contained in:
Mari the Deer 2020-04-30 13:08:17 +02:00
commit de10c1aeec
6 changed files with 111 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

49
zscript/swwm_common.zsc
View file

@ -397,22 +397,10 @@ Class SWWMLoreLibrary : Thinker
String text = String.Format("SWWM_LORETXT_%s",ref);
String assoc = String.Format("SWWM_LOREREL_%s",ref);
// redirects
if ( gameinfo.gametype&(GAME_Raven|GAME_Strife) )
if ( gameinfo.gametype&GAME_Strife )
{
if ( text ~== "SWWM_LORETXT_AKARILABS" )
text = "SWWM_LORETXT_AKARILABS2"; // demo won, akari project announced
if ( text ~== "SWWM_LORETXT_DEMOLITIONIST" )
text = "SWWM_LORETXT_DEMOLITIONIST2"; // demo rewarded with maidbot frame
if ( text ~== "SWWM_LORETXT_UAC" )
text = "SWWM_LORETXT_UAC2"; // uac "reformed"
else if ( text ~== "SWWM_LORETXT_HELL" )
text = "SWWM_LORETXT_HELL2"; // invasion was a thing of the past
else if ( text ~== "SWWM_LORETXT_NANA" )
text = "SWWM_LORETXT_NANA2"; // demo met nana
else if ( text ~== "SWWM_LORETXT_ZANAVETH3" )
text = "SWWM_LORETXT_ZANAVETH32"; // iagb happened
if ( text ~== "SWWM_LORETXT_BIGSHOT" )
text = "SWWM_LORETXT_BIGSHOT2"; // predictions about crimes_m
text = "SWWM_LORETXT_BIGSHOT3"; // crimes_m happened
}
if ( gameinfo.gametype&(GAME_Hexen|GAME_Strife) )
{
@ -421,10 +409,24 @@ Class SWWMLoreLibrary : Thinker
else if ( text ~== "SWWM_LORETXT_ANARUKON" )
text = "SWWM_LORETXT_ANARUKON2"; // comments from miyamoto-xanai wedding
}
if ( gameinfo.gametype&GAME_Strife )
if ( gameinfo.gametype&(GAME_Raven|GAME_Strife) )
{
if ( text ~== "SWWM_LORETXT_BIGSHOT2" )
text = "SWWM_LORETXT_BIGSHOT3"; // crimes_m happened
if ( text ~== "SWWM_LORETXT_AKARILABS" )
text = "SWWM_LORETXT_AKARILABS2"; // demo won, akari project announced
else if ( text ~== "SWWM_LORETXT_DEMOLITIONIST" )
text = "SWWM_LORETXT_DEMOLITIONIST2"; // demo rewarded with maidbot frame
else if ( text ~== "SWWM_LORETXT_DOOMGUY" )
text = "SWWM_LORETXT_DOOMGUY2"; // he gone
else if ( text ~== "SWWM_LORETXT_UAC" )
text = "SWWM_LORETXT_UAC2"; // uac "reformed"
else if ( text ~== "SWWM_LORETXT_HELL" )
text = "SWWM_LORETXT_HELL2"; // invasion was a thing of the past
else if ( text ~== "SWWM_LORETXT_NANA" )
text = "SWWM_LORETXT_NANA2"; // demo met nana
else if ( text ~== "SWWM_LORETXT_ZANAVETH3" )
text = "SWWM_LORETXT_ZANAVETH32"; // iagb happened
else if ( text ~== "SWWM_LORETXT_BIGSHOT" )
text = "SWWM_LORETXT_BIGSHOT2"; // predictions about crimes_m
}
// check that it's valid
if ( StringTable.Localize(tag,false) == tag ) return false;
@ -1699,6 +1701,8 @@ Class SWWMHandler : EventHandler
transient CVar mutevoice, accdamage;
transient ui CVar useshaders;
transient CVar lang;
transient String curlang;
static void HealthFlash( int p )
{
@ -2026,6 +2030,17 @@ Class SWWMHandler : EventHandler
override void WorldTick()
{
if ( !lang ) lang = CVar.GetCVar('language',players[consoleplayer]);
if ( lang.GetString() != curlang )
{
// manually refresh combat tracker tags if language has changed
for ( SWWMCombatTracker t=trackers; t; t=t.next )
{
if ( !t.mytarget || (!t.mytarget.player && !t.mytarget.bISMONSTER) ) continue;
t.mytag = t.mytarget.player?t.mytarget.player.GetUserName():t.mytarget.GetTag();
}
}
curlang = lang.GetString();
if ( !mutevoice ) mutevoice = CVar.GetCVar('swwm_mutevoice',players[consoleplayer]);
if ( onelinertic && (onelinertic < gametic) )
{