From 88449ecbdfc9cb8db9eec07838cc2b2774e4e5f4 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Tue, 5 Nov 2013 13:01:26 +0100 Subject: [PATCH] Zmiana wyswietlania ledwo. --- arkadia/colors.tf | 2 +- arkadia/substitute.tf | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arkadia/colors.tf b/arkadia/colors.tf index 484f216..136e66c 100644 --- a/arkadia/colors.tf +++ b/arkadia/colors.tf @@ -79,7 +79,7 @@ /eval /def -PC%c_alarm -Fp5 -t' rann.' /eval /def -PC%c_alarm -Fp5 -t'w zlej kondycji' /eval /def -PC%c_crit_bold -Fp4 -t'(ciezko rann.)' -;;/eval /def -PC%c_crit_bold -Fp5 -t'ledwo zyw.' +/eval /def -PC%c_crit_bold -Fp5 -t'ledwo zyw.' ; mana /eval /def -PC%c_main_bold -Fp5 -t'mentalnie w pelni sil' diff --git a/arkadia/substitute.tf b/arkadia/substitute.tf index 8b3fad8..3d05e20 100644 --- a/arkadia/substitute.tf +++ b/arkadia/substitute.tf @@ -77,8 +77,6 @@ /shift%;\ /done -/def -mregexp -Fp1 -t'ledwo zyw.' _sub_ledwo = /return substitute(strcat({PL}, decode_attr(decode_attr(toupper({P0}), {zc_bold}), {zc_crit_background}), {PR})) - /def -mregexp -Fp2 -t'([Jj]est(?:es|)) (w swietnej kondycji|w dobrym stanie|(?:lekko |ciezko |)rann.|w zlej kondycji|ledwo zyw.).$' _sub_kondycja_no_fight = \ /if ({P2} =~ "w swietnej kondycji")\ /let _showkondycja=$[strcat(decode_attr("#######", {zc_main}))]%;\ @@ -93,7 +91,7 @@ /elseif ({P2} =/ "ciezko rann*")\ /let _showkondycja=$[strcat(decode_attr("## ", {zc_crit}))]%;\ /elseif ({P2} =/ "ledwo zyw*")\ - /let _showkondycja=$[strcat(decode_attr("-LEDWO-", {zc_crit}))]%;\ + /let _showkondycja=$[strcat(decode_attr(decode_attr("-LEDWO-", {zc_bold}), {zc_crit_background}))]%;\ /endif %;\ /if ({P1} =~ "Jestes")\ /return substitute(strcat("[-] [", {_showkondycja}, "] ", {PL}, decode_attr("### TY ### ", {zc_bold}), {P2}, ".", {PR}))%;\ @@ -125,7 +123,7 @@ /elseif ({P2} =/ "ciezko rann*")\ /let _showkondycja=$[strcat(decode_attr("## ", {zc_crit}))]%;\ /elseif ({P2} =/ "ledwo zyw*")\ - /let _showkondycja=$[strcat(decode_attr("-LEDWO-", {zc_crit}))]%;\ + /let _showkondycja=$[strcat(decode_attr(decode_attr("-LEDWO-", {zc_bold}), {zc_crit_background}))]%;\ /endif %;\ /if ({PR} =~ ".") \ /let _ktobije=$[decode_attr(" ATAKUJESZ", {zc_crit})]%;\