From 4a46817881d5673b4c0c93b38a8e19ad00fd8957 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Thu, 13 Oct 2022 13:43:32 +0200 Subject: [PATCH] HUD face now also affected by tag color. Added two more tag colors to round up to 16. Fixed tag light color not updating when changed. Recalculated tag light colors. --- gldefs.demolitionist | 8 ++++++++ graphics/HUD/DemoFace_Head.png | Bin 401 -> 936 bytes language.def_menu | 2 ++ language.es_menu | 2 ++ language.version | 4 ++-- menudef.txt | 2 ++ models/DemoTagsBlack.png | Bin 0 -> 7881 bytes models/DemoTagsRust.png | Bin 0 -> 7881 bytes zscript/hud/swwm_hud.zsc | 7 ++++++- zscript/swwm_player.zsc | 4 +++- zscript/swwm_player_fx.zsc | 36 ++++++++++++++++++--------------- 11 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 models/DemoTagsBlack.png create mode 100644 models/DemoTagsRust.png diff --git a/gldefs.demolitionist b/gldefs.demolitionist index 51e4b4f31..ed1963c9b 100644 --- a/gldefs.demolitionist +++ b/gldefs.demolitionist @@ -118,3 +118,11 @@ Brightmap Texture "models/DemoTagsYellow.png" { Map "models/DemoTags_bright.png" } +Brightmap Texture "models/DemoTagsBlack.png" +{ + Map "models/DemoTags_bright.png" +} +Brightmap Texture "models/DemoTagsRust.png" +{ + Map "models/DemoTags_bright.png" +} diff --git a/graphics/HUD/DemoFace_Head.png b/graphics/HUD/DemoFace_Head.png index 6565587606d7024c32f68fb7d6bc8888bdfd88f4..311f2256f7c4b55db0b9d2f8713bf63f94f0b9c0 100644 GIT binary patch literal 936 zcmeAS@N?(olHy`uVBq!ia0y~yU}ykg4rT@hhA$5${$yZaSRLRK;>rL4zB3up&M-9m zXPD{BFmoounKXtoXBhrBF#P{7FP~;CC1or>)7E#UgMxyCgM%-_OkZDLkPe13Y1YPR zX=!O4XVT6vR0W->cW`K6_zyCM!FVQv?@Wf7Gi|FtMyC1BY?YrmbLPx5|Mw>(oMB)% z1G4W7$eyZ=XF3?p%uG8o^Z%KRnrF_O`44i(|No(2`_H`lf0g0?UE}}%|C^l%lVo6E zU@Qsp3ubV5b|Z~}foZj;i(^Q|tvA>9u4^{nVSTW}-b6KY+A6PhzCcyAD;wYc&-#9Y z%}cST&nm{h@jZv6P^(3|(v;{cf97qq?#h()n3!d`tMj$Poc)b!{~r;bz`|>4akc2( z2JeP{x>u7sq~r4wUfoJO*Q`A8^DkbW*k>BwZGEqPue5BR_D9h4CgYy6U2kcS@+%|IQm6=v0e1@T-}`^^%e`eit7c~G zVLSdMIHTvE)zjAX-@RGm{)HDVlnk2x;nT*rxEUY!|9<^3BId{M;Hl#GHST3!-6?-b zzTg)_ZG)YI`~v<9>@S$VF!C+n54p>pce8H)(H%CabzJ*X>NxkO)rHF6`1N<+)qU}m z@h7j}yZ)*7``O+6K7Z=wXWZ}K)BmLYZ{3?(AGjeXX399o|CnW0aOT@@!(*xTpX+{D zelGr@_j&HG1DD=^U;3@~c6Ic=5BnyR?=8PyoABcM?||R?UhdVDuaG~HeJ}e9BZ^s2 z?g7Rxjq6`B_vh@lPl~x`yuZEN=zYt1O#lD@ literal 401 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGECYN(Tp1u>=1hh&XBhtf zmzPg7mXfmdo#{K1AaAE8HR@c3^Q%3W~TYhJoEod)y6Y3)Bc}%cdl{uQU(SF z#*!evU_OnRXmtNDj>4L?it66qpI}Xji$++0~U7u}2 z)19tR_8HGBi*7z*x$%XcL8_Etm7Cz(&JWk)gl#vm8M-cB_QBMi=V1Q6+YcA?_^;l} zFwI(zqv6z4-iVH`MZ06CoLtuRv+MEFTmeIWj*5M8{w_Lkj=y(BhzfCDk|}jf;PyXI zQ(ALhTgXcP5qoEg@$I(jLO*0Aa`ftd?&Uuy{WYIIcWK=ge^AhRy85}Sb4q9e0Qw82 AH~;_u diff --git a/language.def_menu b/language.def_menu index 42dac4075..382f68b69 100644 --- a/language.def_menu +++ b/language.def_menu @@ -177,6 +177,8 @@ SWWM_COL_10 = "Red"; SWWM_COL_11 = "Violet"; SWWM_COL_12 = "White"; SWWM_COL_13 = "Yellow"; +SWWM_COL_14 = "Black"; +SWWM_COL_15 = "Rust"; SWWM_UTITLE = "Interface Options"; SWWM_BONKHAMMER = "Bonk Hammer"; SWWM_FRIENDLYFIRE = "Friendly Fire"; diff --git a/language.es_menu b/language.es_menu index 66bbd2643..d2fbeb18d 100644 --- a/language.es_menu +++ b/language.es_menu @@ -174,6 +174,8 @@ SWWM_COL_10 = "Rojo"; SWWM_COL_11 = "Violeta"; SWWM_COL_12 = "Blanco"; SWWM_COL_13 = "Amarillo"; +SWWM_COL_14 = "Negro"; +SWWM_COL_15 = "Óxido"; SWWM_UTITLE = "Opciones de Interfaz"; SWWM_BONKHAMMER = "Martillo Loco"; SWWM_FRIENDLYFIRE = "Fuego Amigo"; diff --git a/language.version b/language.version index 0fb4b4d73..9efda4297 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r570 \cu(Thu 13 Oct 13:02:56 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r570 \cu(2022-10-13 13:02:56)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r571 \cu(Thu 13 Oct 13:43:32 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r571 \cu(2022-10-13 13:43:32)\c-"; diff --git a/menudef.txt b/menudef.txt index 594bcda95..44d7f7eea 100644 --- a/menudef.txt +++ b/menudef.txt @@ -98,6 +98,8 @@ OptionValue "SWWMTagColor" 11, "$SWWM_COL_11" 12, "$SWWM_COL_12" 13, "$SWWM_COL_13" + 14, "$SWWM_COL_14" + 15, "$SWWM_COL_15" } OptionValue "SWWMFriendlyFire" { diff --git a/models/DemoTagsBlack.png b/models/DemoTagsBlack.png new file mode 100644 index 0000000000000000000000000000000000000000..d2c9c5b2dbb7991c1b46982309316ebe2b5a5c90 GIT binary patch literal 7881 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc7G?$phIKJpLm3zt3<7*YTp1V`I5{~51qG#~ zq~zq}l$4az)YSC#_07%A9UL57TwFXoJ$-$BLqkL3;^NZM(rjdS9x*V;g?PF+hDb=R zIcUE*_UF{=56}NP*`~G3>-X+$Hm(k$w|-}+$$5tBFSr{d?C)4US;(jQp5yF>1_8AN z9&a0z*rX>1J>E8Z%C;qH$E?y%Z!Eobt107Ft=RKzDP6zaYwKf6=PkeZwp#x0WPkg= zU)KNsb-(V{#mW5jCpt}b@fxl%^IKJTEohF%;^<>~VY+>3;>$1n&|5W4u{d|#6Bnub zj-f8viZhFqdh=K#L+5Rs!9T}i@oZIrjd%K(3YB`_ADVPUceRS;M7RBoLR@!_p6E3B zwKOvI%C<{4i>ls)ZGxK#YyKCEvLF|H(?Xd`5oFToLMrt=B%QzmNv-1 z+pjM!WewSS%3`9MdAT^ViVGjeJ+o#eIE0$`ExG8cI`gR4x|!8}OD^ha&3?A9!D`JM zkHxohOna^#P;3^?EQ#Kr^VmaZ`K1?TieZyyC(iL%eA|gh℞xr59=fGkz*OPLaAh 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 literal 0 HcmV?d00001 diff --git a/models/DemoTagsRust.png b/models/DemoTagsRust.png new file mode 100644 index 0000000000000000000000000000000000000000..caa54cefd8275b686f8e919d22922f6bfc6ccc53 GIT binary patch literal 7881 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 15) ) facecol = 0; + Screen.DrawTexture(FaceTex[0],false,margin+shake.x,ss.y-(margin+32)+shake.y,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_SrcWidth,32,DTA_SrcHeight,32,DTA_DestWidth,32,DTA_DestHeight,32,DTA_SrcX,32*(facecol%4),DTA_SrcY,32*(facecol/4)); bool raging = CPlayer.mo.FindInventory("RagekitPower"); bool angy = CPlayer.mo.FindInventory("AngeryPower"); if ( raging && angy ) Screen.DrawTexture(FaceTex[16],false,margin+shake.x,ss.y-(margin+32)+shake.y,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true); diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index b2c5f11ce..d0ba374ba 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -181,7 +181,9 @@ Class Demolitionist : PlayerPawn "Red", "Violet", "White", - "Yellow" + "Yellow", + "Black", + "Rust" }; int idx = tagcolor.GetInt(); if ( (idx < 0) || (idx >= colname.Size()) ) idx = 0; diff --git a/zscript/swwm_player_fx.zsc b/zscript/swwm_player_fx.zsc index 02fcba8ac..4ca036784 100644 --- a/zscript/swwm_player_fx.zsc +++ b/zscript/swwm_player_fx.zsc @@ -596,6 +596,7 @@ Class DemolitionistSelfLight : Thinker bool oldglow; Actor target; transient CVar tagcolor; + int oldcolor; override void Tick() { @@ -607,20 +608,22 @@ Class DemolitionistSelfLight : Thinker if ( !tagcolor ) tagcolor = CVar.GetCVar('swwm_tagcolor',target.player); static const Color litecolor[] = { - Color(255,32,48,24), // Green - Color(255,24,24,48), // Blue - Color(255,24,48,48), // Cyan - Color(255,24,48,32), // Dragonfly - Color(255,48,40,24), // Gold - Color(255,48,24,48), // Magenta - Color(255,48,32,24), // Orange - Color(255,48,40,32), // Peach - Color(255,48,32,40), // Pink - Color(255,32,24,48), // Purple - Color(255,48,24,24), // Red - Color(255,32,24,48), // Violet - Color(255,48,48,48), // White - Color(255,48,48,24) // Yellow + Color(255, 24, 48, 8), // Green + Color(255, 16, 24, 56), // Blue + Color(255, 16, 48, 56), // Cyan + Color(255, 24, 48, 24), // Dragonfly + Color(255, 56, 32, 16), // Gold + Color(255, 48, 16, 56), // Magenta + Color(255, 56, 24, 16), // Orange + Color(255, 56, 32, 32), // Peach + Color(255, 56, 16, 40), // Pink + Color(255, 48, 24, 56), // Purple + Color(255, 48, 16, 8), // Red + Color(255, 32, 16, 56), // Violet + Color(255, 48, 48, 48), // White + Color(255, 56, 56, 16), // Yellow + Color(255, 16, 16, 16), // Black + Color(255, 32, 16, 16) // Rust }; int idx = tagcolor.GetInt(); if ( (idx < 0) || (idx >= litecolor.Size()) ) idx = 0; @@ -628,9 +631,9 @@ Class DemolitionistSelfLight : Thinker // setting the pitch to a value outside [-90,90] makes it auto-update to the actor's own pitch // this is undocumented and it's very great and nice and fine that such a thing had to be found out purely by chance // how very wonderful /s - if ( curactive && !oldactive ) + if ( curactive && (!oldactive || (idx != oldcolor)) ) { - target.A_AttachLight('DemoSelfLight',DynamicLight.PointLight,Color(112,144,176),200,0,DynamicLight.LF_DONTLIGHTSELF|DynamicLight.LF_ATTENUATE|DynamicLight.LF_SPOT,(5,0,target.player?(target.player.viewz-target.pos.z):(target.height*.93)),0,15,60,180); + target.A_AttachLight('DemoSelfLight',DynamicLight.PointLight,Color(255,112,144,176),200,0,DynamicLight.LF_DONTLIGHTSELF|DynamicLight.LF_ATTENUATE|DynamicLight.LF_SPOT,(5,0,target.player?(target.player.viewz-target.pos.z):(target.height*.93)),0,15,60,180); target.A_AttachLight('DemoSelfLight2',DynamicLight.PointLight,litecolor[idx],80,0,DynamicLight.LF_DONTLIGHTSELF|DynamicLight.LF_ATTENUATE,(0,0,target.height/2)); } else if ( !curactive && oldactive ) @@ -639,5 +642,6 @@ Class DemolitionistSelfLight : Thinker target.A_AttachLight('DemoSelfLight2',DynamicLight.PointLight,0,0,0); } oldactive = curactive; + oldcolor = idx; } }