Skip to content

Commit

Permalink
Merge pull request #1259 from ADmeral97/PB_Staging
Browse files Browse the repository at this point in the history
Cyan InterText + normal spawns
  • Loading branch information
pa1nki113r authored May 17, 2024
2 parents 7cc0994 + e25c99d commit f9dab0c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion zmapinfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Skill easy
{
MonsterHealth = 0.75
DamageFactor = 0.75
SpawnFilter = easy
SpawnFilter = normal
Textcolor = Cream
Name = "Is Your Fridge Running?"
MustConfirm = "Easy\
Expand Down
16 changes: 8 additions & 8 deletions zscript/PB_StatScreen.zs
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ Class PB_DoomStatusScreen : DoomStatusScreen

override void drawEL()
{
PB_DrawText(502,pbcv_inter?300:0,"Next stop");
PB_DrawText(502,pbcv_inter?300:0,"Next stop",Font.CR_CYAN);
PB_DrawName(pbcv_inter?370:70,wbs.LName1,lnametexts[1]);
}

Expand All @@ -219,21 +219,21 @@ Class PB_DoomStatusScreen : DoomStatusScreen
int ck = cnt_kills[0]; int tk = wbs.maxkills;
int ci = cnt_items[0]; int ti = wbs.maxitems;
int cs = cnt_secret[0]; int ts = wbs.maxsecret;
PB_DrawText(xx*9+1,pbcv_inter?70:0,"You survived");
PB_DrawText(xx*9+1,pbcv_inter?70:0,"You survived",Font.CR_CYAN);
PB_DrawName(pbcv_inter?140:70,wbs.LName0,lnametexts[0]);
//Kills/Items/Secrets row
if(st>=2) PB_DrawText(x1,yy,"Kills");
if(st>=2) PB_DrawText(x1,yy,"Kills",Font.CR_CYAN);
if(st>=4) PB_DrawText(x2,yy,CountStats(ck,tk),AllStats(ck,tk)?Font.CR_GOLD:Font.CR_UNTRANSLATED); yy+=2.5*lh;
if(st>=6) PB_DrawText(x1,yy,"Items");
if(st>=6) PB_DrawText(x1,yy,"Items",Font.CR_CYAN);
if(st>=8) PB_DrawText(x2,yy,CountStats(ci,ti),AllStats(ci,ti)?Font.CR_GOLD:Font.CR_UNTRANSLATED); yy+=2.5*lh;
if(st>=10) PB_DrawText(x1,yy,"Secrets");
if(st>=10) PB_DrawText(x1,yy,"Secrets",Font.CR_CYAN);
if(st>=12) PB_DrawText(x2,yy,CountStats(cs,ts),AllStats(cs,ts)?Font.CR_GOLD:Font.CR_UNTRANSLATED); yy+=3.5*lh;
if(st>=14&&Perfect()) PB_DrawText(xx*10,yy,"\cfPERFECT!"); yy+=3.5*lh;
if(st>=16) //Time row
{
PB_DrawText(x1,yy,"Time"); yy+=2.5*lh;
PB_DrawText(x1,yy,"Total"); yy+=2.5*lh;
if(wbs.partime) PB_DrawText(x1,yy,"Par"); yy-=5*lh;
PB_DrawText(x1,yy,"Time",Font.CR_CYAN); yy+=2.5*lh;
PB_DrawText(x1,yy,"Total",Font.CR_CYAN); yy+=2.5*lh;
if(wbs.partime) PB_DrawText(x1,yy,"Par",Font.CR_CYAN); yy-=5*lh;
}
if(st>=18)
{
Expand Down

0 comments on commit f9dab0c

Please sign in to comment.