OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Also beautify class names in combat trackers (please don't mind the test string).

Browse source
This commit is contained in:
Mari the Deer 2020-08-05 12:38:18 +02:00
commit 4212ea38c2
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
zscript/swwm_common.zsc
View file

@ -386,9 +386,9 @@ Class SWWMUtility
}
// because GetTag() returns the localized string, we need to do things the hard way
static clearscope String GetFunTag( Actor a )
static clearscope String GetFunTag( Actor a, String defstr = "" )
{
if ( a is 'SWWMMonster' ) return SWWMMonster(a).GetFunTag();
if ( a is 'SWWMMonster' ) return SWWMMonster(a).GetFunTag(defstr);
int ntags = 1;
String basetag = "";
switch ( a.GetClassName() )
@ -566,13 +566,13 @@ Class SWWMUtility
basetag = "HERESIARCH";
break;
}
if ( basetag == "" ) return a.GetTag();
if ( basetag == "" ) return a.GetTag(defstr);
String funtag = "FN_"..basetag.."_FUN";
String lfuntag = StringTable.Localize(funtag,false);
if ( lfuntag != funtag ) return lfuntag;
String nfuntag = "FN_"..basetag.."_FUNN";
String lnfuntag = StringTable.Localize(nfuntag,false);
if ( lnfuntag == nfuntag ) return a.GetTag();
if ( lnfuntag == nfuntag ) return a.GetTag(defstr);
ntags = lnfuntag.ToInt();
return StringTable.Localize(String.Format("$FN_%s_FUN%d",basetag,Random[FunTags](1,ntags)));
}
@ -1305,7 +1305,12 @@ Class SWWMCombatTracker : Thinker
if ( !funtags ) funtags = CVar.GetCVar('swwm_funtags',players[consoleplayer]);
if ( mytarget && (mytarget.player || mytarget.bISMONSTER || (mytarget is 'BossBrain')) )
{
String realtag = funtags.GetBool()?SWWMUtility.GetFunTag(mytarget):mytarget.GetTag();
String realtag = funtags.GetBool()?SWWMUtility.GetFunTag(mytarget,"AWESOME IT'S PENIS"):mytarget.GetTag("AWESOME IT'S PENIS");
if ( realtag == "AWESOME IT'S PENIS" )
{
realtag = mytarget.GetClassName();
SWWMUtility.BeautifyClassName(realtag);
}
mytag = mytarget.player?(mytarget.player.mo!=mytarget)?String.Format(StringTable.Localize("$FN_VOODOO"),mytarget.player.GetUserName()):mytarget.player.GetUserName():realtag;
}
else mytag = "";

8
zscript/swwm_menu.zsc
View file

@ -2164,9 +2164,13 @@ Class SWWMKnowledgeBaseMenu : GenericMenu
for ( int i=ofs; i<cnt; i++ )
{
if ( yy >= 370 ) break;
str = GetDefaultByType(sorted_mstats[i].m).GetTag();
str = GetDefaultByType(sorted_mstats[i].m).GetTag("AWESOME IT'S PENIS");
// beautify if there's no tag
if ( str == sorted_mstats[i].m.GetClassName() ) SWWMUtility.BeautifyClassName(str);
if ( str == "AWESOME IT'S PENIS" )
{
str = sorted_mstats[i].m.GetClassName();
SWWMUtility.BeautifyClassName(str);
}
Screen.DrawText(fnt,Font.CR_FIRE,origin.x+xx,origin.y+yy,str,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true);
str = String.Format("%d",sorted_mstats[i].kills);
int len = fnt.StringWidth(str);