OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

More Japanese preparation. Added k6x8 as swap for Miniwi (same height).

Browse source
This commit is contained in:
Mari the Deer 2020-04-29 13:50:44 +02:00
commit 0e897e3073
291 changed files with 50 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
zscript/swwm_common.zsc
View file

@ -1632,15 +1632,18 @@ Class SWWMFontPreloader : StaticEventHandler
{
override void OnRegister()
{
Font.GetFont('Tewi');
Font.GetFont('TewiShaded');
Font.GetFont('TewiShadedInverse');
Font.GetFont('Miniwi');
Font.GetFont('MiniwiShaded');
Font.GetFont('MiniwiShadedInverse');
Font.GetFont('MPlus');
Font.GetFont('MPlusShaded');
Font.GetFont('MPlusShadedInverse');
Font.GetFont('Tewi');
Font.GetFont('TewiShaded');
Font.GetFont('TewiShadedInverse');
Font.GetFont('k6x8');
Font.GetFont('k6x8Shaded');
Font.GetFont('k6x8ShadedInverse');
}
}

13
zscript/swwm_hud.zsc
View file

@ -10,7 +10,7 @@ Class SWWMStatusBar : BaseStatusBar
{
TextureID StatusTex, WeaponTex, ScoreTex, InventoryTex, ChatTex[6],
HealthTex[5], FuelTex, DashTex, EnemyBTex, EnemyHTex[5], GenericAmmoTex[3];
HUDFont mTewiFont, mMiniwiFont, mMPlusFont;
HUDFont mTewiFont, mMiniwiFont, mMPlusFont, mk6x8Font;
// "Full History" contains all messages since session start, nothing is flushed
// this can be accessed from a section of the knowledge base
@ -48,11 +48,17 @@ Class SWWMStatusBar : BaseStatusBar
DynamicValueInterpolator HealthInter, ScoreInter, FuelInter, DashInter;
// returns MPlus if we're playing in Japanese, otherwise returns the requested font
// if playing in Japanese, returns an alternate font of the same height
// Tewi -> MPlus
// Miniwi -> k6x8
Font LangFont( HUDFont req )
{
if ( !lang ) lang = CVar.GetCVar('language',players[consoleplayer]);
if ( lang.GetString() ~== "jp" ) return mMPlusFont.mFont;
if ( lang.GetString() ~== "jp" )
{
if ( req == mMiniwiFont ) return mk6x8Font.mFont;
return mMPlusFont.mFont;
}
return req.mFont;
}
@ -460,6 +466,7 @@ Class SWWMStatusBar : BaseStatusBar
mTewiFont = HUDFont.Create("TewiShaded");
mMiniwiFont = HUDFont.Create("MiniwiShaded");
mMPlusFont = HUDFont.Create("MPlusShaded");
mk6x8Font = HUDFont.Create("k6x8Shaded");
HealthInter = DynamicValueInterpolator.Create(100,.1,1,100);
ScoreInter = DynamicValueInterpolator.Create(0,.1,1,999999999);
FuelInter = DynamicValueInterpolator.Create(120,.5,1,100);