From f2be78ee7a25049f8319205c5dcba4123f001871 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Mon, 16 Jul 2018 15:40:52 +0200 Subject: [PATCH] . --- nightal/colors.tf | 4 ++-- nightal/statusbar.tf | 10 ++++++---- nightal/warn.tf | 32 ++++++++++++++++++++------------ 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/nightal/colors.tf b/nightal/colors.tf index bcbf3ff..010d592 100644 --- a/nightal/colors.tf +++ b/nightal/colors.tf @@ -115,9 +115,9 @@ /eval /def -PC%c_main_bold -Fp5 -t'.*Nagle na ramie zeskakuje ci brazowa zwinna malpka, a za jej obrozka dostrzegasz zatknieta wiadomosc..*' ; mowienie -/eval /def -mregexp -PC%c_speak -Fp5 -t'(Mowisz|Krzyczysz|Szepczesz)(.*):' color_speak_self +;/eval /def -mregexp -PC%c_speak -Fp5 -t'(Mowisz|Krzyczysz|Szepczesz)(.*):' color_speak_self /eval /def -mregexp -PCblack;Cbg%c_speak -Fp5 -t'(mowi|krzyczy|szepcze|ryczy|skrzypi|dudni|mruczy|nuci|marudzi|brzeczy|zawodzi|piszczy|jeczy|skrzeczy|zgrzyta|spiewa|warczy|burczy|syczy|grzmi|belkocze pijacko|huczy|mamrocze|wola)((.*)| )do ciebie:' color_speak_to_me -/eval /def -mregexp -PC%c_speak -Fp5 -t'((?-i)mowi|krzyczy|szepcze|ryczy|skrzypi|dudni|mruczy|nuci|marudzi|brzeczy|zawodzi|piszczy|jeczy|skrzeczy|zgrzyta|spiewa|warczy|burczy|syczy|grzmi|belkocze pijacko|huczy|mamrocze|wola)(| z (.*)|(.*)|( z (.*) do (?!ciebie))|(.*) do (?!ciebie)): .*' color_speak +;/eval /def -mregexp -PC%c_speak -Fp5 -t'((?-i)mowi|krzyczy|szepcze|ryczy|skrzypi|dudni|mruczy|nuci|marudzi|brzeczy|zawodzi|piszczy|jeczy|skrzeczy|zgrzyta|spiewa|warczy|burczy|syczy|grzmi|belkocze pijacko|huczy|mamrocze|wola)(| z (.*)|(.*)|( z (.*) do (?!ciebie))|(.*) do (?!ciebie)): .*' color_speak ; magiki /eval /def -PC%c_spec_bold -Fp2 -t'(okrwawion[a-z]* ogromn[a-z]* berdysz[a-z]*|\ diff --git a/nightal/statusbar.tf b/nightal/statusbar.tf index 3322f3e..ab70e73 100644 --- a/nightal/statusbar.tf +++ b/nightal/statusbar.tf @@ -182,9 +182,11 @@ /set alarm=$[decode_attr("WALKA BEZ BRONI",{zc_alarm})] /def -mregexp -Fp2 -t'(Wystarczy moment nieuwagi, chwila rozproszenia bys nie|Niespodziewanie z gruntu pod twoimi stopami wytryskuje strumien roslinnych pedow oraz korzeni!)' _stun = \ - /set warningstat=$[strcat("[", decode_attr(decode_attr(" OGLUSZENIE ", {zc_bold}), {zc_crit_background}), "]")] + /set warningstat=$[strcat("[", decode_attr(decode_attr(" STUN ", {zc_bold}), {zc_crit_background}), "]")] +/def -mregexp -Fp2 -t'(Cios jest tak silny, ze lekko cie oszalamia. Z trudem dostrzegasz kolejne uderzenia.)' _daze = \ + /set warningstat=$[strcat("[", decode_attr(decode_attr(" DAZE ", {zc_bold}), {zc_crit_background}), "]")] -/def -mregexp -p2 -t'(Czujesz, ze paraliz minal|Konczysz paralyze)' _nostun = \ +/def -mregexp -p2 -t'(Czujesz, ze paraliz minal|Konczysz paralyze|Powoli dochodzisz do siebie)' _nostun = \ /set warningstat=[ ] /def -mregexp -Fp2 -t'skupia na chwile swoj wzrok na tobie' _zniewolenie = \ @@ -196,8 +198,8 @@ /status_edit -r3 weaponstat:4:C%c_crit /def -mregexp -p2 -t'Czujesz, jak krew w twoch dloniach krazy coraz predzej i odretwienie ustepuje.' _nowytracenie = \ - /set warningstat=$[strcat("[", decode_attr(decode_attr(" DOBADZ BRONI: F2 ", {zc_bold}), {zc_blue}), "]")] %;\ - /def key_f2 = \ + /set warningstat=$[strcat("[", decode_attr(decode_attr(" DOBADZ BRONI: F3 ", {zc_bold}), {zc_blue}), "]")] %;\ + /def key_f3 = \ dobadz wszystkich broni %%; \ /set warningstat=[ ] %%;\ /set alarm=$[decode_attr("none", {zc_main})] diff --git a/nightal/warn.tf b/nightal/warn.tf index f90c622..f38f676 100644 --- a/nightal/warn.tf +++ b/nightal/warn.tf @@ -1,33 +1,41 @@ /def -mregexp -Fp2 -t'przekazuje ci .*druzyn' warn_lead = \ /beep 1 %;\ /echo %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- PROWADZISZ ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- PROWADZISZ ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- PROWADZISZ ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- LEAD ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- LEAD ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- LEAD ---@{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo + +/def -mregexp -Fp2 -t'Cios jest tak silny, ze lekko cie oszalamia. Z trudem dostrzegasz kolejne uderzenia.' sub_oszolomienie = \ + /beep 1 %;\ + /echo %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- DAZE ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- DAZE ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- DAZE ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ /echo /def -mregexp -Fp2 -t'Impet .* ciosu sprawia ze pada .* na ziemie' sub_ogluszenie = \ /beep 1 %;\ /echo %;\ - /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- OGLUSZENIE ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- OGLUSZENIE ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- OGLUSZENIE ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- STUN ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- STUN ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- STUN ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ /echo /def -mregexp -Fp2 -t'Nagle z rur umieszczonych pod sufitem zaczyna tryskac zielona substancja' sub_kwas = \ /beep 1 %;\ /echo %;\ - /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- ! KWAS ! ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- ! KWAS ! ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ - /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- ! KWAS ! ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- KWAS ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- KWAS ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ + /echo -p @{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold}--- KWAS ---@{n}@{C%c_crit_bold}XXXXXXXXXXXXXXXXXXXXXXXXX %;\ /echo /def -mregexp -Fp2 -t'Wtem plynace mozolnie po niebie, biale i puszyste chmury rozstepuja sie, azeby ukazac osadzone' warn_apsa = \ /beep 1 %;\ /echo %;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- APOKALIPSA --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- APOKALIPSA --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ - /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- APOKALIPSA --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- APSA --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- APSA --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ + /echo -p @{C%c_alarm}XXXXXXXXXXXXXXXXXXXX@{n}@{C%c_bold} --- APSA --- @{n}@{C%c_alarm}XXXXXXXXXXXXXXXXXXXX%;\ /echo /def -mregexp -Fp2 -t'(Runy na ostrzu dlugiego runicznego lewaka|Gdy dlugi runiczny lewak natrafia na)' warn_magic_lewak = \