diff --git a/damtypes.txt b/damtypes.txt index b6cfd2d65..f33d01e23 100644 --- a/damtypes.txt +++ b/damtypes.txt @@ -1,15 +1,15 @@ # from damnums Steel MiniWhite -Blood MiniRed -Ice MiniSilver -Fire MiniBrass +Blood MiniTomato +Ice MiniIce +Fire MiniOrange Earth MiniKirinHUD Quake MiniKirinHUD Electric MiniYellow Lightning MiniYellow Gravity MiniPurple -Poison MiniPurple -PoisonCloud MiniPurple +Poison MiniMagenta +PoisonCloud MiniMagenta Dark MiniIbukiHUD Rocket MiniGold Explode MiniGold @@ -20,11 +20,11 @@ Disintegrate MiniGreen BFG MiniGreen BFGSplash MiniGreen # from abort_m -Succ MiniDemoPink -Foam MiniGreen -PeaShot MiniGreen +Succ MiniPink +Foam MiniMint +PeaShot MiniGrass Salty MiniWhite -Rage MiniBrass +Rage MiniOrange Poke MiniKirinHUD Love MiniSayaHUD Thonk MiniYellow @@ -33,44 +33,44 @@ RaveYellow MiniYellow RaveGreen MiniGreen RaveCyan MiniCyan RaveBlue MiniBlue -RaveMagenta MiniPurple +RaveMagenta MiniMagenta # from doom tournament Pulsed MiniGreen Zapped MiniGreen Shot MiniYellow -Jolted MiniCyan -JoltedX MiniBrass +Jolted MiniCyanBlu +JoltedX MiniOrange RedeemerDeath MiniIbukiHUD Shredded MiniDemoPink Decapitated MiniSayaHUD Slime MiniGreen Impact MiniWhite -RipperAltDeath MiniRed +RipperAltDeath MiniTomato RocketDeath MiniKirinHUD GrenadeDeath MiniKirinHUD # from doomreal DAmmo1 MiniBlue DAmmo2 MiniGreen DAmmo3 MiniYellow -DAmmo4 MiniBrass +DAmmo4 MiniOrange DAmmo5 MiniRed -Stinger MiniKinylum -TarydiumCharge MiniKinylum +Stinger MiniAqua +TarydiumCharge MiniAqua Exploded MiniGold Stunned MiniCyan -Impaler MiniNokorokinylum +Impaler MiniMagenta PeaceDeath MiniGold PeaceBarrelDeath MiniGold BigShot MiniGold # from demolitionist -Love MiniDemoPink -Push MiniDemoBlue -AirRip MiniDemoBlue -Explodium MiniNokron +Love MiniPink +Push MiniCyanBlu +AirRip MiniCyanBlu +Explodium MiniFire Salt MiniKinylum -Concussion MiniPurple -CriticalConcussion MiniMana +Concussion MiniBlurp +CriticalConcussion MiniWitch Wallbust MiniSayaHUD Jet MiniWhite -Ynykron MiniVoidHUD -YnykronAlt MiniVoidHUD +Ynykron MiniPurb +YnykronAlt MiniPurb diff --git a/fonts/XekkasNum/0031.png b/fonts/XekkasNum/0031.png index 8051f3148..e9966600a 100644 Binary files a/fonts/XekkasNum/0031.png and b/fonts/XekkasNum/0031.png differ diff --git a/fonts/XekkasNum/0034.png b/fonts/XekkasNum/0034.png index 20ed2e7f1..8595dbe91 100644 Binary files a/fonts/XekkasNum/0034.png and b/fonts/XekkasNum/0034.png differ diff --git a/fonts/XekkasNum/0036.png b/fonts/XekkasNum/0036.png index 771e79483..1daf74148 100644 Binary files a/fonts/XekkasNum/0036.png and b/fonts/XekkasNum/0036.png differ diff --git a/fonts/XekkasNum/0039.png b/fonts/XekkasNum/0039.png index 8e2585d81..54eeb5c65 100644 Binary files a/fonts/XekkasNum/0039.png and b/fonts/XekkasNum/0039.png differ diff --git a/graphics/HUD/BiosparkShot.png b/graphics/HUD/BiosparkShot.png index 43a4d5310..6ee973e6e 100644 Binary files a/graphics/HUD/BiosparkShot.png and b/graphics/HUD/BiosparkShot.png differ diff --git a/graphics/HUD/BlastRoundInert.png b/graphics/HUD/BlastRoundInert.png index 6bfc49c2b..e1bbb2172 100644 Binary files a/graphics/HUD/BlastRoundInert.png and b/graphics/HUD/BlastRoundInert.png differ diff --git a/graphics/HUD/DeepImpactBar.png b/graphics/HUD/DeepImpactBar.png index 1403248c6..d2351890b 100644 Binary files a/graphics/HUD/DeepImpactBar.png and b/graphics/HUD/DeepImpactBar.png differ diff --git a/graphics/HUD/DemoFace_Head.png b/graphics/HUD/DemoFace_Head.png index f12b8457d..656558760 100644 Binary files a/graphics/HUD/DemoFace_Head.png and b/graphics/HUD/DemoFace_Head.png differ diff --git a/graphics/HUD/EnemyBar1.png b/graphics/HUD/EnemyBar1.png index dcc342adf..d743b4088 100644 Binary files a/graphics/HUD/EnemyBar1.png and b/graphics/HUD/EnemyBar1.png differ diff --git a/graphics/HUD/HealthBar1.png b/graphics/HUD/HealthBar1.png index 1e480ff06..77d0a7330 100644 Binary files a/graphics/HUD/HealthBar1.png and b/graphics/HUD/HealthBar1.png differ diff --git a/graphics/HUD/HellblazerCrackshot.png b/graphics/HUD/HellblazerCrackshot.png index 05382f569..fdea510b2 100644 Binary files a/graphics/HUD/HellblazerCrackshot.png and b/graphics/HUD/HellblazerCrackshot.png differ diff --git a/graphics/HUD/HellblazerWarhead.png b/graphics/HUD/HellblazerWarhead.png index f398673f6..3abcc7474 100644 Binary files a/graphics/HUD/HellblazerWarhead.png and b/graphics/HUD/HellblazerWarhead.png differ diff --git a/graphics/HUD/ItamexBar.png b/graphics/HUD/ItamexBar.png index efcc9e5e4..2c0b9b685 100644 Binary files a/graphics/HUD/ItamexBar.png and b/graphics/HUD/ItamexBar.png differ diff --git a/graphics/HUD/MenuShellBlue.png b/graphics/HUD/MenuShellBlue.png index d8f574cf2..a5af028e6 100644 Binary files a/graphics/HUD/MenuShellBlue.png and b/graphics/HUD/MenuShellBlue.png differ diff --git a/graphics/HUD/MenuShellPurple.png b/graphics/HUD/MenuShellPurple.png index 1e15c89e2..03dc5d276 100644 Binary files a/graphics/HUD/MenuShellPurple.png and b/graphics/HUD/MenuShellPurple.png differ diff --git a/graphics/HUD/MisterGrenade.png b/graphics/HUD/MisterGrenade.png index 3c068a911..89eb7384e 100644 Binary files a/graphics/HUD/MisterGrenade.png and b/graphics/HUD/MisterGrenade.png differ diff --git a/graphics/HUD/MisterGrenadeCasing.png b/graphics/HUD/MisterGrenadeCasing.png new file mode 100644 index 000000000..2c831a29d Binary files /dev/null and b/graphics/HUD/MisterGrenadeCasing.png differ diff --git a/graphics/HUD/MisterRound.png b/graphics/HUD/MisterRound.png index 0c65e7caf..283c0ff87 100644 Binary files a/graphics/HUD/MisterRound.png and b/graphics/HUD/MisterRound.png differ diff --git a/graphics/HUD/QuadravolCasing.png b/graphics/HUD/QuadravolCasing.png index 692a40f93..552427c84 100644 Binary files a/graphics/HUD/QuadravolCasing.png and b/graphics/HUD/QuadravolCasing.png differ diff --git a/graphics/HUD/QuadravolRound.png b/graphics/HUD/QuadravolRound.png index e7d6e358e..e42482d22 100644 Binary files a/graphics/HUD/QuadravolRound.png and b/graphics/HUD/QuadravolRound.png differ diff --git a/graphics/HUD/RayKhomBar.png b/graphics/HUD/RayKhomBar.png index 42e08f6cd..ed1827bc7 100644 Binary files a/graphics/HUD/RayKhomBar.png and b/graphics/HUD/RayKhomBar.png differ diff --git a/graphics/HUD/RayKhomRound.png b/graphics/HUD/RayKhomRound.png index a02f7c9d0..5f48365ab 100644 Binary files a/graphics/HUD/RayKhomRound.png and b/graphics/HUD/RayKhomRound.png differ diff --git a/graphics/HUD/ShellBlue.png b/graphics/HUD/ShellBlue.png index e88fcc18d..b79f0373e 100644 Binary files a/graphics/HUD/ShellBlue.png and b/graphics/HUD/ShellBlue.png differ diff --git a/graphics/HUD/ShellBlueSmall.png b/graphics/HUD/ShellBlueSmall.png index fce4bd5af..2b29f3ef0 100644 Binary files a/graphics/HUD/ShellBlueSmall.png and b/graphics/HUD/ShellBlueSmall.png differ diff --git a/graphics/HUD/ShellGold.png b/graphics/HUD/ShellGold.png index de5e57171..052d22379 100644 Binary files a/graphics/HUD/ShellGold.png and b/graphics/HUD/ShellGold.png differ diff --git a/graphics/HUD/ShellPurple.png b/graphics/HUD/ShellPurple.png index c285c99cb..a0fb9c3b9 100644 Binary files a/graphics/HUD/ShellPurple.png and b/graphics/HUD/ShellPurple.png differ diff --git a/graphics/HUD/ShellPurpleSmall.png b/graphics/HUD/ShellPurpleSmall.png index eb8434d55..ea4a3d9dc 100644 Binary files a/graphics/HUD/ShellPurpleSmall.png and b/graphics/HUD/ShellPurpleSmall.png differ diff --git a/graphics/HUD/SilverBulletFCB.png b/graphics/HUD/SilverBulletFCB.png index 358fd0852..494f047cc 100644 Binary files a/graphics/HUD/SilverBulletFCB.png and b/graphics/HUD/SilverBulletFCB.png differ diff --git a/graphics/HUD/SilverBulletXSB.png b/graphics/HUD/SilverBulletXSB.png index 0ae04e037..565b8c970 100644 Binary files a/graphics/HUD/SilverBulletXSB.png and b/graphics/HUD/SilverBulletXSB.png differ diff --git a/graphics/HUD/YnykronBarBeam.png b/graphics/HUD/YnykronBarBeam.png index 6d272a15b..12d28d17c 100644 Binary files a/graphics/HUD/YnykronBarBeam.png and b/graphics/HUD/YnykronBarBeam.png differ diff --git a/graphics/HUD/YnykronBarVortex.png b/graphics/HUD/YnykronBarVortex.png index fb903dfd2..ca5d9d722 100644 Binary files a/graphics/HUD/YnykronBarVortex.png and b/graphics/HUD/YnykronBarVortex.png differ diff --git a/graphics/HUD/YnykronIconBeam.png b/graphics/HUD/YnykronIconBeam.png index c54fc0a51..43a80cb0f 100644 Binary files a/graphics/HUD/YnykronIconBeam.png and b/graphics/HUD/YnykronIconBeam.png differ diff --git a/graphics/HUD/YnykronIconVortex.png b/graphics/HUD/YnykronIconVortex.png index b4c1f7d41..f53b9385c 100644 Binary files a/graphics/HUD/YnykronIconVortex.png and b/graphics/HUD/YnykronIconVortex.png differ diff --git a/language.version b/language.version index 321a259bc..e645e556b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r399 \cu(Sat 3 Sep 18:28:13 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r399 \cu(2022-09-03 18:28:13)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r400 \cu(Sat 3 Sep 19:52:48 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r400 \cu(2022-09-03 19:52:48)\c-"; diff --git a/textcolors.txt b/textcolors.txt index 4c5fc8424..8179e7df9 100644 --- a/textcolors.txt +++ b/textcolors.txt @@ -260,6 +260,112 @@ MiniDemoPink // Pink from Demo-chan's chassis #993D7A #CC7AB1 152 203 #CC7AB1 #FFCCEE 204 255 } +// additional general colors +MiniOrange +{ + #000000 #FF8000 +} +MiniGrass +{ + #000000 #80FF00 +} +MiniMint +{ + #000000 #00FF80 +} +MiniAqua +{ + #000000 #0080FF +} +MiniMagenta +{ + #000000 #FF00FF +} +MiniPink +{ + #000000 #FF0080 +} +// additional specialized colors +MiniCrystal // gemstone-ish +{ + #000000 #003311 0 50 + #003311 #006633 51 101 + #006633 #269973 102 151 + #269973 #66CCBB 152 203 + #66CCBB #BFFFFF 204 255 +} +MiniFire // akin to zdoom's +{ + #000000 #330000 0 50 + #330000 #661400 51 101 + #661400 #993D00 102 151 + #993D00 #CC7A00 152 203 + #CC7A00 #FFCC00 204 255 +} +MiniSulfur // acidic looking +{ + #000000 #332200 0 50 + #332200 #664D00 51 101 + #664D00 #998000 102 151 + #998000 #CCBB00 152 203 + #CCBB00 #FFFF00 204 255 +} +MiniWitch // purple but faded highlights +{ + #000000 #000933 0 50 + #000933 #000066 51 101 + #000066 #331F99 102 151 + #331F99 #7A52CC 152 203 + #7A52CC #CC99FF 204 255 +} +MiniCyanblu // cyan-blue gradient +{ + #000000 #000033 0 50 + #000033 #001A66 51 101 + #001A66 #266099 102 151 + #266099 #66B3CC 152 203 + #66B3CC #BFFFFF 204 255 +} +MiniIce // more saturated Child of Ash HUD gradient +{ + #000000 #052433 0 50 + #052433 #1F4866 51 101 + #1F4866 #4D7399 102 151 + #4D7399 #8FA8CC 152 203 + #8FA8CC #E6EEFF 204 255 +} +MiniPurpur // blue-pink gradient +{ + #000000 #33001A 0 50 + #33001A #66004D 51 101 + #66004D #992699 102 151 + #992699 #B366CC 152 203 + #B366CC #DFBFFF 204 255 +} +MiniTomato // faded red gradient +{ + #000000 #330000 0 50 + #330000 #660000 51 101 + #660000 #992626 102 151 + #992626 #CC6666 152 203 + #CC6666 #FFBFBF 204 255 +} +MiniBlurp // blue-purple gradient +{ + #000000 #330F2D 0 50 + #330F2D #5C2966 51 101 + #5C2966 #734D99 102 151 + #734D99 #887ACC 152 203 + #887ACC #B3C0FF 204 255 +} +MiniPurb // purple-blue gradient +{ + #000000 #000033 0 50 + #000033 #1A0066 51 101 + #1A0066 #4D0099 102 151 + #4D0099 #9900CC 152 203 + #9900CC #FF00FF 204 255 +} // more colors will be added as needed over time // flash colors (flat, cut to black on outline/shadow) MiniFlash // "obtained" diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc index 2fd82ae9f..26274510e 100644 --- a/zscript/hud/swwm_hud.zsc +++ b/zscript/hud/swwm_hud.zsc @@ -60,6 +60,22 @@ Enum EMiniHUDFontColor MCR_NOKOROKINYLUM, MCR_DEMOBLUE, MCR_DEMOPINK, + MCR_ORANGE, + MCR_GRASS, + MCR_MINT, + MCR_AQUA, + MCR_MAGENTA, + MCR_PINK, + MCR_CRYSTAL, + MCR_FIRE, + MCR_SULFUR, + MCR_WITCH, + MCR_CYANBLU, + MCR_ICE, + MCR_PURPUR, + MCR_TOMATO, + MCR_BLURP, + MCR_PURB, MCR_FLASH, MCR_REDFLASH, NUM_MINIHUD_COLOR @@ -1237,14 +1253,30 @@ Class SWWMStatusBar : BaseStatusBar mhudfontcol[MCR_NOKOROKINYLUM] = Font.FindFontColor("MiniNokorokinylum"); mhudfontcol[MCR_DEMOBLUE] = Font.FindFontColor("MiniDemoBlue"); mhudfontcol[MCR_DEMOPINK] = Font.FindFontColor("MiniDemoPink"); + mhudfontcol[MCR_ORANGE] = Font.FindFontColor("MiniOrange"); + mhudfontcol[MCR_GRASS] = Font.FindFontColor("MiniGrass"); + mhudfontcol[MCR_MINT] = Font.FindFontColor("MiniMint"); + mhudfontcol[MCR_AQUA] = Font.FindFontColor("MiniAqua"); + mhudfontcol[MCR_MAGENTA] = Font.FindFontColor("MiniMagenta"); + mhudfontcol[MCR_PINK] = Font.FindFontColor("MiniPink"); + mhudfontcol[MCR_CRYSTAL] = Font.FindFontColor("MiniCrystal"); + mhudfontcol[MCR_FIRE] = Font.FindFontColor("MiniFire"); + mhudfontcol[MCR_SULFUR] = Font.FindFontColor("MiniSulfur"); + mhudfontcol[MCR_WITCH] = Font.FindFontColor("MiniWitch"); + mhudfontcol[MCR_CYANBLU] = Font.FindFontColor("MiniCyanblu"); + mhudfontcol[MCR_ICE] = Font.FindFontColor("MiniIce"); + mhudfontcol[MCR_PURPUR] = Font.FindFontColor("MiniPurpur"); + mhudfontcol[MCR_TOMATO] = Font.FindFontColor("MiniTomato"); + mhudfontcol[MCR_BLURP] = Font.FindFontColor("MiniBlurp"); + mhudfontcol[MCR_PURB] = Font.FindFontColor("MiniPurb"); mhudfontcol[MCR_FLASH] = Font.FindFontColor("MiniFlash"); mhudfontcol[MCR_REDFLASH] = Font.FindFontColor("MiniRedFlash"); - tclabel = mhudfontcol[MCR_BRASS]; + tclabel = mhudfontcol[MCR_CYANBLU]; tcvalue = mhudfontcol[MCR_WHITE]; tcextra = mhudfontcol[MCR_IBUKIHUD]; tccompl = mhudfontcol[MCR_YELLOW]; tcsucks = mhudfontcol[MCR_RED]; - tclabel_s = "[MiniBrass]"; + tclabel_s = "[MiniCyanblu]"; tcextra_s = "[MiniIbukiHUD]"; minimapzoom = oldminimapzoom = 1.; LastHealth = CPlayer?CPlayer.health:100; @@ -2890,7 +2922,7 @@ Class SWWMStatusBar : BaseStatusBar int hcolor = MCR_RED; if ( round(ht) > 500 ) hcolor = MCR_YELLOW; else if ( round(ht) > 200 ) hcolor = MCR_PURPLE; - else if ( round(ht) > 100 ) hcolor = MCR_CYAN; + else if ( round(ht) > 100 ) hcolor = MCR_AQUA; if ( isInvulnerable() || CPlayer.mo.FindInventory("InvinciballPower") ) { Screen.DrawTexture(HealthTex[0],false,margin+3+ox,ss.y-(margin+19+oy),DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_WindowRightF,hw,DTA_ColorOverlay,Color(255,0,0,0));