From 046ac1f2121745eee0633e66a8604c9abd394fc4 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Tue, 7 Mar 2023 07:53:38 +0100 Subject: [PATCH] Make scripted chat messages use the chat message color. --- language.def_base | 8 ++++---- language.es_base | 6 +++--- language.version | 4 ++-- zscript/handler/swwm_handler_oneliners.zsc | 2 +- zscript/handler/swwm_handler_process.zsc | 2 +- zscript/hud/swwm_hud_messages.zsc | 4 ++-- zscript/hud/swwm_hudextra.zsc | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/language.def_base b/language.def_base index c1f922436..5453e204e 100644 --- a/language.def_base +++ b/language.def_base @@ -844,10 +844,10 @@ BT_DOOMTEST = "Oatley, Bane of the Quakers"; BT_ARCHANGELUS = "Archangelus, Celestial Agent"; BT_ARCHANGELUS_FUN = "Big Fucking Angel Dude"; // boss oneliners -BOSSLINE_IOS = "\crIcon of Sin\c-: !oremoR nhoJ ,em llik tsum uoy emag eht niw oT"; -BOSSLINE_DSPARIL = "\cgD'Sparil\c-: .hself ruoy erutrot lliw I"; -BOSSLINE_ARCHANGELUS = "\cfArchangelus\c-: Foolish mortal, only your death is eternal!"; -BOSSLINE_ROM3R0 = "\crROM3R-0\c-: .hctib ym emoceb dna ™xoB tsaeB ™LIGIS eht yuB .sremooD wollef ,olleH"; +BOSSLINE_IOS = "\crIcon of Sin\c*: !oremoR nhoJ ,em llik tsum uoy emag eht niw oT\c*"; +BOSSLINE_DSPARIL = "\cgD'Sparil\c*: .hself ruoy erutrot lliw I\c*"; +BOSSLINE_ARCHANGELUS = "\cfArchangelus\c*: Foolish mortal, only your death is eternal!\c*"; +BOSSLINE_ROM3R0 = "\crROM3R-0\c*: .hctib ym emoceb dna ™xoB tsaeB ™LIGIS eht yuB .sremooD wollef ,olleH\c*"; // targetter SWWM_OVERKILL = "Overkill"; SWWM_MULTIKILL = "Multi Kill"; diff --git a/language.es_base b/language.es_base index d381feef3..f0d4c4303 100644 --- a/language.es_base +++ b/language.es_base @@ -727,9 +727,9 @@ BT_DOOMTEST = "Oatley, Azote de los Cuáqueros"; BT_ARCHANGELUS = "Arcángelus, Agente Celestial"; BT_ARCHANGELUS_FUN = "Un Putísimo Ángel Enorme"; // boss oneliners -BOSSLINE_IOS = "\crIcono del Pecado\c-: !oremoR nhoJ ,ím a emratam sebed ogeuj le ranag araP¡"; -BOSSLINE_DSPARIL = "\cgD'Sparil\c-: .senrac sut érarutroT"; -BOSSLINE_ARCHANGELUS = "\cfArcángelus\c-: Mortal insensato, ¡solo tu muerte es eterna!"; +BOSSLINE_IOS = "\crIcono del Pecado\c*: !oremoR nhoJ ,ím a emratam sebed ogeuj le ranag araP¡\c*"; +BOSSLINE_DSPARIL = "\cgD'Sparil\c*: .senrac sut érarutroT\c*"; +BOSSLINE_ARCHANGELUS = "\cfArcángelus\c*: Mortal insensato, ¡solo tu muerte es eterna!\c*"; // targetter SWWM_OVERKILL = "Sobremuerte"; SWWM_MULTIKILL = "Racha"; diff --git a/language.version b/language.version index ab62f121d..fdf00830c 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r774 \cu(Mon 6 Mar 17:26:27 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r774 \cu(2023-03-06 17:26:27)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r775 \cu(Tue 7 Mar 07:53:38 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r775 \cu(2023-03-07 07:53:38)\c-"; diff --git a/zscript/handler/swwm_handler_oneliners.zsc b/zscript/handler/swwm_handler_oneliners.zsc index 5d59dbb98..930e6c7e4 100644 --- a/zscript/handler/swwm_handler_oneliners.zsc +++ b/zscript/handler/swwm_handler_oneliners.zsc @@ -150,7 +150,7 @@ extend Class SWWMHandler { let l = SWWMOneLiner.Make(oneliner,onelinerspan); StatusBar.AttachMessage(l,-3473); - SendNetworkEvent("swwmstoremessage.\cd"..(multiplayer?players[consoleplayer].GetUserName():"Demo").."\c-: "..StringTable.Localize(oneliner),level.totaltime,PRINT_CHAT,consoleplayer); + SendNetworkEvent("swwmstoremessage.\cd"..(multiplayer?players[consoleplayer].GetUserName():"Demo").."\c*: "..StringTable.Localize(oneliner).."\c*",level.totaltime,PRINT_CHAT,consoleplayer); } SendNetworkEvent("swwmremotelinertxt."..oneliner,consoleplayer,onelinerlevel); } diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index 158207240..0404df9a7 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -468,7 +468,7 @@ extend Class SWWMHandler if ( dist < 2000 ) { Console.Printf("\cx%s\cx: %s\c-",players[e.Args[0]].GetUserName(),StringTable.Localize(e.Name.Mid(19))); - if ( swwm_voicelog ) SWWMFullHistory.PushMessage("\cd"..players[e.Args[0]].GetUserName().."\c-: "..StringTable.Localize(e.Name.Mid(19)),level.totaltime,PRINT_CHAT); + if ( swwm_voicelog ) SWWMFullHistory.PushMessage("\cd"..players[e.Args[0]].GetUserName().."\c*: "..StringTable.Localize(e.Name.Mid(19)).."\c*",level.totaltime,PRINT_CHAT); } } else if ( e.Name ~== "swwmcleartransaction" ) diff --git a/zscript/hud/swwm_hud_messages.zsc b/zscript/hud/swwm_hud_messages.zsc index cacbaec74..92ddd39b6 100644 --- a/zscript/hud/swwm_hud_messages.zsc +++ b/zscript/hud/swwm_hud_messages.zsc @@ -69,7 +69,7 @@ extend Class SWWMStatusBar } if ( koraxline ) { - Console.PrintfEx(PRINT_CHAT,"\cmKorax\c-: "..msg); + Console.PrintfEx(PRINT_CHAT,"\cmKorax\c*: "..msg.."\c*"); return true; } bool ispuzzle = false; @@ -191,7 +191,7 @@ extend Class SWWMStatusBar mainframeline = true; if ( mainframeline ) { - Console.PrintfEx(PRINT_CHAT,"\cmAI Mainframe\c-: "..msg); + Console.PrintfEx(PRINT_CHAT,"\cmAI Mainframe\c*: "..msg.."\c*"); return true; } if ( !fnt || (fnt == smallfont) ) diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc index 2be99a86d..77aa1fd64 100644 --- a/zscript/hud/swwm_hudextra.zsc +++ b/zscript/hud/swwm_hudextra.zsc @@ -342,9 +342,9 @@ Class SWWMDirectMessage : HUDMessageBase txt.Split(storemsg,"\n"); foreach ( msg:storemsg ) { - EventHandler.SendNetworkEvent("swwmstoremessage."..chrname..": "..msg,level.totaltime,PRINT_CHAT,consoleplayer); + EventHandler.SendNetworkEvent("swwmstoremessage."..chrname.."\c*: "..msg.."\c*",level.totaltime,PRINT_CHAT,consoleplayer); // stick it into the console as well - Console.PrintfEx(PRINT_CHAT|PRINT_NONOTIFY,chrname..": "..msg); + Console.PrintfEx(PRINT_CHAT|PRINT_NONOTIFY,chrname.."\c*: "..msg.."\c*"); } }