diff --git a/common/lists.tf b/common/lists.tf index 8cd4518..09c7480 100644 --- a/common/lists.tf +++ b/common/lists.tf @@ -68,7 +68,7 @@ /let REBINDER_AKTUALNA_LISTA_LIST $[substr({REBINDER_AKTUALNY_Z_LISTY_LIST},0,strstr({REBINDER_AKTUALNY_Z_LISTY_LIST},"#"))]%;\ /let REBINDER_KOLOR $[pobierz_kolor_z_listy({REBINDER_AKTUALNA_LISTA_LIST})]%;\ /if ( strstr(REBINDER_KOLOR," ") == -1 ) \ - /if (regmatch("b(.*)",REBINDER_KOLOR)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR)) \ /if ( {P1} =~ "lue" ) \ /let REBINDER_KOLOR_DEF -PCblue%;\ /else \ @@ -80,7 +80,7 @@ /else \ /let REBINDER_KOLOR_1 $[substr(REBINDER_KOLOR,0,strstr(REBINDER_KOLOR," "))]%;\ /let REBINDER_KOLOR_2 $[substr(REBINDER_KOLOR,strstr(REBINDER_KOLOR," ")+1)]%;\ - /if (regmatch("b(.*)",REBINDER_KOLOR_1)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR_1)) \ /if ({P1} =~ "lue" ) \ /let REBINDER_KOLOR_DEF -PCblue,Cbg%REBINDER_KOLOR_2%;\ /else \ @@ -104,7 +104,7 @@ /if ( {*} =~ NULL | {*} =~ {REBINDER_AKTUALNA_LISTA_LIST} ) \ /let REBINDER_KOLOR $[pobierz_kolor_z_listy({REBINDER_AKTUALNA_LISTA_LIST})] %;\ /if ( strstr(REBINDER_KOLOR," ") == -1 ) \ - /if (regmatch("b(.*)",REBINDER_KOLOR)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR)) \ /if ( {P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue}$[toupper(REBINDER_AKTUALNA_LISTA_LIST)]@{n}" wgrana. Rekordy: @{B}$[--j]@{n} %;\ /else \ @@ -116,7 +116,7 @@ /else \ /let REBINDER_KOLOR_1 $[substr(REBINDER_KOLOR,0,strstr(REBINDER_KOLOR," "))]%;\ /let REBINDER_KOLOR_2 $[substr(REBINDER_KOLOR,strstr(REBINDER_KOLOR," ")+1)]%;\ - /if (regmatch("b(.*)",REBINDER_KOLOR_1)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR_1)) \ /if ({P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue,Cbg%REBINDER_KOLOR_2}$[toupper(REBINDER_AKTUALNA_LISTA_LIST)]@{n}" wgrana. Rekordy: @{B}$[--j]@{n} %;\ /else \ @@ -157,52 +157,40 @@ /echo -p #@{BC%kolor_info}#@{n}# Nie podano koloru dla tej listy. %;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ /elseif ( strstr({REBINDER_LISTA_LISTY},{2}) == -1 & {3} !~ NULL ) \ - /if ( {3} !~ "white" & {3} !~ "yellow" & {3} !~ "red" & {3} !~ "magenta" & {3} !~ "blue" & {3} !~ "cyan" & {3} !~ "green" & {3} !~ "black" & {3} !~ "bwhite" & {3} !~ "byellow" & {3} !~ "bred" & {3} !~ "bmagenta" & {3} !~ "bblue" & {3} !~ "bcyan" & {3} !~ "bgreen") \ + /if ( {4} =~ NULL ) \ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /echo -p #@{BC%kolor_info}#@{n}# Podany kolor jest niewlasciwy. %;\ + /if (regmatch("^b(.*)",{3})) \ + /if ({P1} =~ "lue" ) \ + /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue}$[toupper({2})]@{n}" zostala dodana. %;\ + /else \ + /echo -p #@{BC%kolor_info}#@{n}# Lista "@{BC%P1}$[toupper({2})]@{n}" zostala dodana. %;\ + /endif %;\ + /else \ + /echo -p #@{BC%kolor_info}#@{n}# Lista "@{C%{3}}$[toupper({2})]@{n}" zostala dodana. %;\ + /endif %;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ + /if ( strstr({REBINDER_LISTA_LISTY},"@") == -1 ) \ + /set REBINDER_LISTA_LISTY $[strcat("@",{REBINDER_LISTA_LISTY})]%;\ + /endif%;\ + /set REBINDER_LISTA_LISTY $[strcat({REBINDER_LISTA_LISTY},{2},"#",{3},"@")]%;\ + /rebinder_zapisz_liste LISTY%;\ /else \ - /if ( {4} =~ NULL ) \ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /if (regmatch("b(.*)",{3})) \ + /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ + /if (regmatch("^b(.*)",{3})) \ /if ({P1} =~ "lue" ) \ - /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue}$[toupper({2})]@{n}" zostala dodana. %;\ + /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue}@{Cbg%{4}}$[toupper({2})]@{n}" zostala dodana. %;\ /else \ - /echo -p #@{BC%kolor_info}#@{n}# Lista "@{BC%P1}$[toupper({2})]@{n}" zostala dodana. %;\ + /echo -p #@{BC%kolor_info}#@{n}# Lista "@{BC%P1,Cbg%{4}}$[toupper({2})]@{n}" zostala dodana. %;\ /endif %;\ /else \ - /echo -p #@{BC%kolor_info}#@{n}# Lista "@{C%{3}}$[toupper({2})]@{n}" zostala dodana. %;\ + /echo -p #@{BC%kolor_info}#@{n}# Lista "@{C%{3},Cbg%{4}}$[toupper({2})]@{n}" zostala dodana. %;\ /endif %;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ /if ( strstr({REBINDER_LISTA_LISTY},"@") == -1 ) \ /set REBINDER_LISTA_LISTY $[strcat("@",{REBINDER_LISTA_LISTY})]%;\ /endif%;\ - /set REBINDER_LISTA_LISTY $[strcat({REBINDER_LISTA_LISTY},{2},"#",{3},"@")]%;\ + /set REBINDER_LISTA_LISTY $[strcat({REBINDER_LISTA_LISTY},{2},"#",{3},"#",{4},"@")]%;\ /rebinder_zapisz_liste LISTY%;\ - /else \ - /if ( {4} !~ "white" & {4} !~ "yellow" & {4} !~ "red" & {4} !~ "magenta" & {4} !~ "blue" & {4} !~ "cyan" & {4} !~ "green" & {4} !~ "black" & {4} !~ "bwhite")\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /echo -p #@{BC%kolor_info}#@{n}# Podany kolor tla jest niewlasciwy. %;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /else \ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /if (regmatch("b(.*)",{3})) \ - /if ({P1} =~ "lue" ) \ - /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue}@{Cbg%{4}}$[toupper({2})]@{n}" zostala dodana. %;\ - /else \ - /echo -p #@{BC%kolor_info}#@{n}# Lista "@{BC%P1,Cbg%{4}}$[toupper({2})]@{n}" zostala dodana. %;\ - /endif %;\ - /else \ - /echo -p #@{BC%kolor_info}#@{n}# Lista "@{C%{3},Cbg%{4}}$[toupper({2})]@{n}" zostala dodana. %;\ - /endif %;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /if ( strstr({REBINDER_LISTA_LISTY},"@") == -1 ) \ - /set REBINDER_LISTA_LISTY $[strcat("@",{REBINDER_LISTA_LISTY})]%;\ - /endif%;\ - /set REBINDER_LISTA_LISTY $[strcat({REBINDER_LISTA_LISTY},{2},"#",{3},"#",{4},"@")]%;\ - /rebinder_zapisz_liste LISTY%;\ - /endif%;\ - /endif%;\ /endif%;\ /endif%;\ /elseif ( strstr({REBINDER_LISTA_LISTY},{1}) == -1 ) \ @@ -240,24 +228,6 @@ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ /echo -p #@{BC%kolor_info}#@{n}# Podaj przynajmniej jeden kolor, ktory chcesz zmienic w liscie. %;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /elseif ( $(/length %{*}) > 2 & {L1} > 0 ) \ - /if ( strstr(rebinder_def_pomocniczy({1}),substr({-L1},strchr({-L1},char(32)) + 1)) == -1 ) \ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /echo -p #@{BC%kolor_info}#@{n}# Nie ma takiej osoby na tej liscie. %;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /else \ - /let REBINDER_LEWO $[substr(rebinder_def_pomocniczy({1}),0,strstr(rebinder_def_pomocniczy({1}),substr({-L1},strchr({-L1},char(32)) + 1)))]%;\ - /let REBINDER_PRAWO $[substr(rebinder_def_pomocniczy({1}),strstr(rebinder_def_pomocniczy({1}),substr({-L1},strchr({-L1},char(32)) + 1)))]%;\ - /let REBINDER_SRODEK $[substr(REBINDER_PRAWO,0,strstr(REBINDER_PRAWO,"@"))]%;\ - /let REBINDER_PRAWO $[substr(REBINDER_PRAWO,strstr(REBINDER_PRAWO,"@"))]%;\ - /let REBINDER_SRODEK_1 $[substr(REBINDER_SRODEK,0,strstr(REBINDER_SRODEK,"!"))]%;\ - /set REBINDER_LISTA_%1 $[strcat(REBINDER_LEWO,REBINDER_SRODEK_1,"!",{L1},REBINDER_PRAWO)]%;\ - /rebinder_zapisz_liste $[tolower({1})]%;\ - /lists $[tolower({1})] silent%;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /echo -p #@{BC%kolor_info}#@{n}# Ok, $[toupper(substr({-L1},strchr({-L1},char(32)) + 1))] z listy "$[toupper({1})]" ma od teraz priorytet %{L1}. $[pad("(*)",38 - strlen({*}))]%;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /endif%;\ /else \ /let REBINDER_LEWO=$[substr(REBINDER_LISTA_LISTY,0,strstr(REBINDER_LISTA_LISTY,{1}))]%;\ /let REBINDER_SRODEK=$[substr(REBINDER_LISTA_LISTY,strstr(REBINDER_LISTA_LISTY,{1}))]%;\ @@ -265,21 +235,16 @@ /let REBINDER_SRODEK_1=$[substr(REBINDER_SRODEK,0,strstr(REBINDER_SRODEK,"#") + 1)]%;\ /let REBINDER_SRODEK_2=$[substr(REBINDER_SRODEK,strstr(REBINDER_SRODEK,"#") + 1)]%;\ /if ( {3} =~ NULL ) \ - /if ( {2} !~ "white" & {2} !~ "yellow" & {2} !~ "red" & {2} !~ "magenta" & {2} !~ "blue" & {2} !~ "cyan" & {2} !~ "green" & {2} !~ "black" & {2} !~ "bwhite" & {2} !~ "byellow" & {2} !~ "bred" & {2} !~ "bmagenta" & {2} !~ "bblue" & {2} !~ "bcyan" & {2} !~ "bgreen" & {2} < 0 ) \ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /echo -p #@{BC%kolor_info}#@{n}# Podany kolor jest niewlasciwy. %;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /else \ + /eval /echo %{1} aaa %{2} %;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /if (regmatch("b(.*)",{2})) \ - /if ({P1} =~ "lue" ) \ - /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{Cblue}$[toupper({1})]@{n}" %;\ - /else \ - /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{BC%P1}$[toupper({1})]@{n}" %;\ - /endif %;\ + /if (regmatch("^b(.*)",{2})) \ + /if ({P1} =~ "lue" ) \ + /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{Cblue}$[toupper({1})]@{n}" %;\ /else \ - /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{C%{2}}$[toupper({1})]@{n}" %;\ + /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{BC%P1}$[toupper({1})]@{n}" %;\ /endif %;\ + /else \ + /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{C%{2}}$[toupper({1})]@{n}" %;\ /let REBINDER_KOLOR %{2}%;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ /set REBINDER_LISTA_LISTY $[strcat(REBINDER_LEWO,REBINDER_SRODEK_1,REBINDER_KOLOR,REBINDER_PRAWO)]%;\ @@ -287,28 +252,21 @@ /lists $[tolower({1})] silent%;\ /endif %;\ /else \ - /if ( {3} !~ "white" & {3} !~ "yellow" & {3} !~ "red" & {3} !~ "magenta" & {3} !~ "blue" & {3} !~ "cyan" & {3} !~ "green" & {3} !~ "black" ) \ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /echo -p #@{BC%kolor_info}#@{n}# Podany kolor tla jest niewlasciwy. %;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /else \ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /if (regmatch("b(.*)",{2})) \ - /if ({P1} =~ "lue" ) \ - /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{Cblue,Cbg%{3}}$[toupper({1})]@{n}" %;\ - /else \ - /echo %{P1} %;\ - /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{BC%P1,Cbg%{3}}$[toupper({1})]@{n}" %;\ - /endif %;\ + /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ + /if (regmatch("^b(.*)",{2})) \ + /if ({P1} =~ "lue" ) \ + /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{Cblue,Cbg%{3}}$[toupper({1})]@{n}" %;\ /else \ - /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{C%{2},Cbg%{3}}$[toupper({1})]@{n}" %;\ + /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{BC%P1},Cbg%{3}}$[toupper({1})]@{n}" %;\ /endif %;\ - /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /let REBINDER_KOLOR %{2}#%{3}%;\ - /set REBINDER_LISTA_LISTY $[strcat(REBINDER_LEWO,REBINDER_SRODEK_1,REBINDER_KOLOR,REBINDER_PRAWO)]%;\ - /rebinder_zapisz_liste LISTY%;\ - /lists $[tolower({1})] silent%;\ - /endif%;\ + /else \ + /echo -p #@{BC%kolor_info}#@{n}# Zmieniono kolor listy "@{C%{2},Cbg%{3}}$[toupper({1})]@{n}" %;\ + /endif %;\ + /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ + /let REBINDER_KOLOR %{2}#%{3}%;\ + /set REBINDER_LISTA_LISTY $[strcat(REBINDER_LEWO,REBINDER_SRODEK_1,REBINDER_KOLOR,REBINDER_PRAWO)]%;\ + /rebinder_zapisz_liste LISTY%;\ + /lists $[tolower({1})] silent%;\ /endif%;\ /endif @@ -326,7 +284,7 @@ /let REBINDER_AKTUALNA_LISTA_LIST $[substr({REBINDER_AKTUALNY_Z_LISTY_LIST},0,strstr({REBINDER_AKTUALNY_Z_LISTY_LIST},"#"))]%;\ /let REBINDER_KOLOR $[pobierz_kolor_z_listy({REBINDER_AKTUALNA_LISTA_LIST})]%;\ /if ( strstr(REBINDER_KOLOR," ") == -1 ) \ - /if (regmatch("b(.*)",REBINDER_KOLOR)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR)) \ /if ( {P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# [ %i $[strrep(".",60 - strlen({i}) - strlen(REBINDER_AKTUALNA_LISTA_LIST))] @{Cblue}$[toupper(REBINDER_AKTUALNA_LISTA_LIST)]@{n} ]@{n} %;\ /else \ @@ -338,7 +296,7 @@ /else \ /let REBINDER_KOLOR_1 $[substr(REBINDER_KOLOR,0,strstr(REBINDER_KOLOR," "))]%;\ /let REBINDER_KOLOR_2 $[substr(REBINDER_KOLOR,strstr(REBINDER_KOLOR," ")+1)]%;\ - /if (regmatch("b(.*)",REBINDER_KOLOR_1)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR_1)) \ /if ( {P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# [ %i $[strrep(".",60 - strlen({i}) - strlen(REBINDER_AKTUALNA_LISTA_LIST))] @{Cblue,Cbg%{REBINDER_KOLOR_2}}$[toupper(REBINDER_AKTUALNA_LISTA_LIST)]@{n} ]@{n}%;\ /else \ @@ -361,7 +319,7 @@ /else \ /let REBINDER_KOLOR $[pobierz_kolor_z_listy({1})]%;\ /if ( strstr(REBINDER_KOLOR," ") == -1 ) \ - /if (regmatch("b(.*)",REBINDER_KOLOR)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR)) \ /if ( {P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# -- [ OSOBY Z LISTY @{Cblue}$[toupper({1})]@{n} @{n}] $[strrep("-",50 - strlen({1}))] %;\ /else \ @@ -373,7 +331,7 @@ /else \ /let REBINDER_KOLOR_1 $[substr(REBINDER_KOLOR,0,strstr(REBINDER_KOLOR," "))]%;\ /let REBINDER_KOLOR_2 $[substr(REBINDER_KOLOR,strstr(REBINDER_KOLOR," ")+1)]%;\ - /if (regmatch("b(.*)",REBINDER_KOLOR_1)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR_1)) \ /if ( {P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# -- [ OSOBY Z LISTY @{Cblue,Cbg%{REBINDER_KOLOR_2}}$[toupper({1})]@{n}] $[strrep("-",50 - strlen({1}))] %;\ /else \ @@ -419,7 +377,7 @@ /set REBINDER_LISTA_LISTY=$[strcat({REBINDER_LISTA_LEWO}, {REBINDER_LISTA_PRAWO})]%;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ /if ( strstr(REBINDER_KOLOR," ") == -1 ) \ - /if (regmatch("b(.*)",REBINDER_KOLOR)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR)) \ /if ( {P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue}$[toupper({2})]@{n}" zostala usunieta. %;\ /else \ @@ -431,7 +389,7 @@ /else \ /let REBINDER_KOLOR_1 $[substr(REBINDER_KOLOR,0,strstr(REBINDER_KOLOR," "))]%;\ /let REBINDER_KOLOR_2 $[substr(REBINDER_KOLOR,strstr(REBINDER_KOLOR," ")+1)]%;\ - /if (regmatch("b(.*)",REBINDER_KOLOR_1)) \ + /if (regmatch("^b(.*)",REBINDER_KOLOR_1)) \ /if ({P1} =~ "lue" ) \ /echo -p #@{BC%kolor_info}#@{n}# Lista "@{Cblue,Cbg%REBINDER_KOLOR_2}$[toupper({2})]@{n}" zostala usunieta. %;\ /else \ diff --git a/common/team.tf b/common/team.tf index 4a7cf97..ad95ee2 100644 --- a/common/team.tf +++ b/common/team.tf @@ -101,6 +101,7 @@ /set ogolne_leader_bie=$$[replace("jinesha","jinesh", {ogolne_leader_bie})]%%;\ /set ogolne_leader_bie=$$[replace("ursa", "urse", {ogolne_leader_bie})]%%;\ /set ogolne_leader_bie=$$[replace("aenya", "aenye", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("aylinna", "aylinn", {ogolne_leader_bie})]%%;\ /set ogolne_druzyna=%%{P5-DRUZYNA} %%;\ /_ustaw_druzyne%;\ /if ( {1} !~ "-q" )\ @@ -153,6 +154,7 @@ /set ogolne_druzyna_bie=$[replace("jinesha", "jinesh", {ogolne_druzyna_bie})]%;\ /set ogolne_druzyna_bie=$[replace("ursa", "urse", {ogolne_druzyna_bie})]%;\ /set ogolne_druzyna_bie=$[replace("aenya", "aenye", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("aylinna", "aylinn", {ogolne_druzyna_bie})]%;\ /_zaslona_binds /def _zaslona_binds = \