diff --git a/graphics/Fanart/Marisa.jpg b/graphics/Fanart/Marisa.jpg new file mode 100644 index 000000000..4a09e8972 Binary files /dev/null and b/graphics/Fanart/Marisa.jpg differ diff --git a/graphics/Fanart/Marisa2.jpg b/graphics/Fanart/Marisa2.jpg new file mode 100644 index 000000000..c588dc974 Binary files /dev/null and b/graphics/Fanart/Marisa2.jpg differ diff --git a/graphics/Fanart/Marisa3.jpg b/graphics/Fanart/Marisa3.jpg new file mode 100644 index 000000000..c5aa3ccb8 Binary files /dev/null and b/graphics/Fanart/Marisa3.jpg differ diff --git a/language.def_base b/language.def_base index 6eacb39d8..c2a46eb4e 100644 --- a/language.def_base +++ b/language.def_base @@ -797,13 +797,16 @@ SWWM_INTERTIP119 = "If enemies are getting in your way while you're admiring the SWWM_INTERTIP120 = "I find that if you just talk, your mouth comes up with stuff."; // intermission fanart SWWM_FANART = "Art: "; -SWWM_NFANART = "6"; +SWWM_NFANART = "9"; SWWM_FANART1 = "S20TBL.jpg;Substance20 (@S20_TBL)"; SWWM_FANART2 = "CaptainJ.png;Captain J (@Jho7835)"; SWWM_FANART3 = "RedeadITA.png;Redead-ITA"; SWWM_FANART4 = "Shivers.png;Sgt. Shivers (@Sgt_Shivers_)"; SWWM_FANART5 = "Endie.jpg;Moa Dixøn / Endie (@MoaDixon)"; SWWM_FANART6 = "CaptainJ2.png;Captain J (@Jho7835)"; +SWWM_FANART7 = "Marisa.jpg"; +SWWM_FANART8 = "Marisa2.jpg"; +SWWM_FANART9 = "Marisa3.jpg"; // achievements SWWM_ACHIEVEMENT_GCSANDWICH_TAG = "A Little Sandwich, as a Treat"; SWWM_ACHIEVEMENT_GCSANDWICH_TXT = "Use %d Grilled Cheese Sandwiches"; diff --git a/language.version b/language.version index 4c5033b7d..2e9ab83b2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r324 \cu(Sun 7 Mar 01:02:30 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r324 \cu(2021-03-07 01:02:30)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r325 \cu(Sun 7 Mar 02:13:54 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r325 \cu(2021-03-07 02:13:54)\c-"; diff --git a/zscript/menu/swwm_inter.zsc b/zscript/menu/swwm_inter.zsc index 2007d7785..6832a53dd 100644 --- a/zscript/menu/swwm_inter.zsc +++ b/zscript/menu/swwm_inter.zsc @@ -91,18 +91,21 @@ Class SWWMStatScreen : StatusScreen abstract { String artstr = StringTable.Localize(String.Format("$SWWM_FANART%d",whichart)); int semic = artstr.IndexOf(";"); - if ( !arttex ) arttex = TexMan.CheckForTexture(String.Format("graphics/Fanart/%s",artstr.Left(semic)),TexMan.Type_MiscPatch); + if ( !arttex ) arttex = TexMan.CheckForTexture(String.Format("graphics/Fanart/%s",(semic==-1)?artstr:artstr.Left(semic)),TexMan.Type_MiscPatch); tsize = TexMan.GetScaledSize(arttex); sar = tsize.x/tsize.y; if ( sar > ar ) vsize = (tsize.y*ar,tsize.y); else if ( sar < ar ) vsize = (tsize.x,tsize.x/ar); else vsize = tsize; Screen.DrawTexture(arttex,false,(vsize.x-tsize.x)/2,(vsize.y-tsize.y)/2,DTA_VirtualWidthF,vsize.x,DTA_VirtualHeightF,vsize.y,DTA_KeepRatio,true); - String bstr = String.Format("\cx%s\c- %s",StringTable.Localize("$SWWM_FANART"),artstr.Mid(semic+1)); - int len = fnt.StringWidth(bstr); - int bw = int((len+8)*hs), bh = int((fnt.GetHeight()+4)*hs); - Screen.Dim("Black",.8,Screen.GetWidth()-bw,Screen.GetHeight()-bh,bw,bh); - Screen.DrawText(fnt,Font.CR_GOLD,ss.x-(len+4),ss.y-(fnt.GetHeight()+2),bstr,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + if ( semic != -1 ) + { + String bstr = String.Format("\cx%s\c- %s",StringTable.Localize("$SWWM_FANART"),artstr.Mid(semic+1)); + int len = fnt.StringWidth(bstr); + int bw = int((len+8)*hs), bh = int((fnt.GetHeight()+4)*hs); + Screen.Dim("Black",.8,Screen.GetWidth()-bw,Screen.GetHeight()-bh,bw,bh); + Screen.DrawText(fnt,Font.CR_GOLD,ss.x-(len+4),ss.y-(fnt.GetHeight()+2),bstr,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); + } } // intermission tips at the bottom if ( !whichtip )