From c63a5ec172530ce5bb200416bc6fffe61b6d9dc5 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 15 Aug 2012 02:05:55 +0200 Subject: [PATCH] Poprawki indentacji, zmiana defaultowego koloru walki wlasnej, bug w /op --- arkadia/colors.tf | 4 +- arkadia/combat.tf | 6 +- arkadia/money.tf | 20 +++---- common/combat.tf | 52 ++++++++--------- common/lists.tf | 6 +- common/sets.tf | 2 +- common/start.tf | 2 +- common/team.tf | 138 +++++++++++++++++++++++----------------------- nightal/combat.tf | 6 +- 9 files changed, 118 insertions(+), 118 deletions(-) diff --git a/arkadia/colors.tf b/arkadia/colors.tf index a3aa178..36dac7b 100644 --- a/arkadia/colors.tf +++ b/arkadia/colors.tf @@ -295,7 +295,7 @@ /endif %;\ /done %;\ /let _szer=$[wrapsize / 2 - 4] %;\ - /test echo(strcat("+", strrep("-", {_szer} * 2 - 44 - %{wrapspace}), "+")) %;\ + /test echo(strcat("+", strrep("-", {_szer} * 2 - 46 - %{wrapspace}), "+")) %;\ /let i=0 %;\ /while (i < 4) \ /let i1=$[{i} * 2 + 1] %;\ @@ -314,7 +314,7 @@ /set _zb2=$[substr({_zb2},_k2+1)] %;\ /test echo(strcat("| ", pad({_name}, - {_szer} + 25 + %{wrapspace}), " | ", pad({_name2}, - {_szer} + 24 + %{wrapspace}), " |")) %;\ /done %;\ - /test echo(strcat("+", strrep("-", {_szer} * 2 - 44 - %{wrapspace}), "+")) %;\ + /test echo(strcat("+", strrep("-", {_szer} * 2 - 46 - %{wrapspace}), "+")) %;\ /endif %;\ /test ++i %;\ /done %;\ diff --git a/arkadia/combat.tf b/arkadia/combat.tf index 32b872e..43160e1 100644 --- a/arkadia/combat.tf +++ b/arkadia/combat.tf @@ -1,7 +1,7 @@ /def _atak = \ - /let n=$[strchr({*}, '|')]%;\ - /test param1 := substr({*}, 0, n)%;\ - /test param2 := substr({*}, n+1) %;\ + /let n=$[strchr({*}, '|')]%;\ + /test param1 := substr({*}, 0, n)%;\ + /test param2 := substr({*}, n+1) %;\ /if ( {attackmode} =~ "1" ) \ zabij %{param1} %;\ /elseif ( {attackmode} =~ "2" ) \ diff --git a/arkadia/money.tf b/arkadia/money.tf index 623d479..824000e 100644 --- a/arkadia/money.tf +++ b/arkadia/money.tf @@ -86,16 +86,16 @@ ; by Siro /def ocenkamienie = \ - /def -mregexp -F -t'^(?:> |)(?:Jest tu|Wydaje ci sie|Sa tu).*czyli jakies (.*) miedz.*.' sumujemy_kamurki = \ - /eval /set suma_kamieni=$$[{suma_kamieni} + %%{P1}] %;\ - /def -mregexp -F -t'^(?:> |)Oceniasz.*waz[ay] (.*) gram.*' waga_kamurkow = \ - /eval /set waga_kamieni=$$[{waga_kamieni} + %%{P1}] %;\ - /set suma_kamieni=;; %;\ - /set waga_kamieni=;; %;\ - /send ocen kamienie %;\ - /repeat -1 1 /sumujemy_kamurki_wynik + /def -mregexp -F -t'^(?:> |)(?:Jest tu|Wydaje ci sie|Sa tu).*czyli jakies (.*) miedz.*.' sumujemy_kamurki = \ + /eval /set suma_kamieni=$$[{suma_kamieni} + %%{P1}] %;\ + /def -mregexp -F -t'^(?:> |)Oceniasz.*waz[ay] (.*) gram.*' waga_kamurkow = \ + /eval /set waga_kamieni=$$[{waga_kamieni} + %%{P1}] %;\ + /set suma_kamieni=;; %;\ + /set waga_kamieni=;; %;\ + /send ocen kamienie %;\ + /repeat -1 1 /sumujemy_kamurki_wynik /def sumujemy_kamurki_wynik = \ /echo %;\ - /echo -p #@{BC%kolor_info}#@{n}# Wartosc %{suma_kamieni} miedzi czyli okolo @{BC%kolor_info}$[{suma_kamieni}/24000] mithryli, $[mod({suma_kamieni},24000)/240] zlota, $[mod({suma_kamieni},240)/12] srebra i $[mod({suma_kamieni},12)] miedzi@{n}%;\ - /repeat -4 1 /undef sumujemy_kamurki%%;/unset suma_kamieni%%;/unset waga_kamieni + /echo -p #@{BC%kolor_info}#@{n}# Wartosc %{suma_kamieni} miedzi czyli okolo @{BC%kolor_info}$[{suma_kamieni}/24000] mithryli, $[mod({suma_kamieni},24000)/240] zlota, $[mod({suma_kamieni},240)/12] srebra i $[mod({suma_kamieni},12)] miedzi@{n}%;\ + /repeat -4 1 /undef sumujemy_kamurki%%;/unset suma_kamieni%%;/unset waga_kamieni diff --git a/common/combat.tf b/common/combat.tf index d5e6c60..c593e01 100644 --- a/common/combat.tf +++ b/common/combat.tf @@ -5,33 +5,33 @@ /def cel = \ /if ( {*} !~ NULL )\ - /if (strstr({*}, "|") != -1) \ - /let n=$[strchr({*}, '|')] %;\ - /test cel := substr({*}, 0, n) %;\ - /test celu := substr({*}, n+1) %;\ - /else \ - /set cel %{*} %;\ - /set celu %{*} %;\ - /endif %;\ + /if (strstr({*}, "|") != -1) \ + /let n=$[strchr({*}, '|')] %;\ + /test cel := substr({*}, 0, n) %;\ + /test celu := substr({*}, n+1) %;\ + /else \ + /set cel %{*} %;\ + /set celu %{*} %;\ + /endif %;\ /endif %;\ /echo -p #@{BC%kolor_info}#@{n}# 1st: @{BC%kolor_info}%cel@{n} (lamanie @{BC%kolor_info}%celu@{n})%;\ /echo -p #@{BC%kolor_info}#@{n}# 2nd: @{BC%kolor_info}%cel2@{n} (lamanie @{BC%kolor_info}%cel2u@{n})%;\ - /echo -p #@{BC%kolor_info}#@{n}# Typ: @{BC%kolor_info}%opis_ataku@{n} + /echo -p #@{BC%kolor_info}#@{n}# Typ: @{BC%kolor_info}%opis_ataku@{n} /def cel2 = \ /if ( {*} !~ NULL )\ - /if (strstr({*}, "|") != -1) \ - /let n=$[strchr({*}, '|')] %;\ - /test cel2 := substr({*}, 0, n) %;\ - /test cel2u := substr({*}, n+1) %;\ - /else \ - /set cel2 %{*} %;\ - /set cel2u %{*} %;\ - /endif %;\ + /if (strstr({*}, "|") != -1) \ + /let n=$[strchr({*}, '|')] %;\ + /test cel2 := substr({*}, 0, n) %;\ + /test cel2u := substr({*}, n+1) %;\ + /else \ + /set cel2 %{*} %;\ + /set cel2u %{*} %;\ + /endif %;\ /endif %;\ /echo -p #@{BC%kolor_info}#@{n}# 1st: @{BC%kolor_info}%cel@{n} (lamanie @{BC%kolor_info}%celu@{n})%;\ /echo -p #@{BC%kolor_info}#@{n}# 2nd: @{BC%kolor_info}%cel2@{n} (lamanie @{BC%kolor_info}%cel2u@{n})%;\ - /echo -p #@{BC%kolor_info}#@{n}# Typ: @{BC%kolor_info}%opis_ataku@{n} + /echo -p #@{BC%kolor_info}#@{n}# Typ: @{BC%kolor_info}%opis_ataku@{n} /def am = \ /if ( {1} =~ "1" ) \ @@ -66,14 +66,14 @@ /endif /alias x \ - /if (strstr({*}, "|") != -1) \ - /let n=$[strchr({*}, '|')] %;\ - /test p1 := substr({*}, 0, n) %;\ - /test p2 := substr({*}, n+1) %;\ - /_atak %{p1}|%{p2} %;\ - /else \ - /_atak %{*}|%{*} %;\ - /endif + /if (strstr({*}, "|") != -1) \ + /let n=$[strchr({*}, '|')] %;\ + /test p1 := substr({*}, 0, n) %;\ + /test p2 := substr({*}, n+1) %;\ + /_atak %{p1}|%{p2} %;\ + /else \ + /_atak %{*}|%{*} %;\ + /endif /alias x1 /_atak %{cel}|%{celu} /alias x2 /_atak drugiego %{cel}|drugiego %{celu} /alias x3 /_atak trzeciego %{cel}|trzeciego %{celu} diff --git a/common/lists.tf b/common/lists.tf index 3a8014d..8cd4518 100644 --- a/common/lists.tf +++ b/common/lists.tf @@ -52,7 +52,7 @@ /echo -p #@{BC%kolor_info}#@{n}# /wyswietl %;\ /echo -p #@{BC%kolor_info}#@{n}# %;\ /echo -p #@{BC%kolor_info}#@{n}# ------------------------------------------------------------------------ %;\ - /else \ + /else \ /let REBINDER_AKTUALNY_Z_LISTY_LIST $[strcat(substr(rebinder_def_pomocniczy("LISTY"),1),":")]%;\ /let i=1%;\ /let k=1%;\ @@ -190,10 +190,10 @@ /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. %;\ + /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. %;\ + /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 ) \ diff --git a/common/sets.tf b/common/sets.tf index c81127c..7c6522f 100644 --- a/common/sets.tf +++ b/common/sets.tf @@ -39,7 +39,7 @@ /set kolor_fight red ; kolor ciosów własnych -/set kolor_fight_me yellow +/set kolor_fight_me rgb530 ; kolor speców: /set kolor_spec magenta diff --git a/common/start.tf b/common/start.tf index b4c7179..300c927 100644 --- a/common/start.tf +++ b/common/start.tf @@ -9,7 +9,7 @@ /eval /log -w%{obecnie_swiat} %{logpath}/%{obecnie_swiat}/%{obecnie_expujacy}_$[ftime("%Y-%b-%d", time())].log /def -mglob -Fp2 -t'* z hosta:*' _logged = \ - /reload %;\ + /reload %;\ /repeat -5 1 /start %;\ /repeat -6 1 /set ingame=1 diff --git a/common/team.tf b/common/team.tf index 9a7cf3f..e63474b 100644 --- a/common/team.tf +++ b/common/team.tf @@ -66,42 +66,42 @@ /set ogolne_leader_bie=$$(/_l_odmien B %%{ogolne_leader}) %%;\ /set ogolne_leader_nar=$$(/_l_odmien N %%{ogolne_leader}) %%;\ ;; nightal - /set ogolne_leader_bie=$$[replace("arda", "arde", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("rydharde", "rydharda", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("larella", "larelle", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("enta", "entu", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("tyrania", "tyranie", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("naraka", "naraku", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("isobella", "isobell", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("perla", "perle", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("ayrena", "ayren", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("szassa", "szass", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("venisa", "venise", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("maevea", "maeve", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("rteca", "rtec", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("myrela", "myrale", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("squibiea", "squibiego", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("rhera", "rhere", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("arda", "arde", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("rydharde", "rydharda", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("larella", "larelle", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("enta", "entu", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("tyrania", "tyranie", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("naraka", "naraku", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("isobella", "isobell", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("perla", "perle", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("ayrena", "ayren", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("szassa", "szass", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("venisa", "venise", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("maevea", "maeve", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("rteca", "rtec", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("myrela", "myrale", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("squibiea", "squibiego", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("rhera", "rhere", {ogolne_leader_bie})]%%;\ ;; arkadia - /set ogolne_leader_bie=$$[replace("myra", "myre", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("elikea", "elike", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("bara", "bare", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("necra", "necre", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("ayletta", "aylett", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("deliego", "deli", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("ilanea", "ilane", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("aida", "aide", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("ineza", "inez", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("nastilla", "nastille", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("lidia", "lidie", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("gerdia", "gerdie", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("arroniego", "arronie", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("istrida","istrid", {ogolne_leader_bie})]%%;\ - /set ogolne_leader_bie=$$[replace("vaea","vae", {ogolne_leader_bie})]%%;\ - /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_druzyna=%%{P5-DRUZYNA} %%;\ + /set ogolne_leader_bie=$$[replace("myra", "myre", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("elikea", "elike", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("bara", "bare", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("necra", "necre", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("ayletta", "aylett", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("deliego", "deli", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("ilanea", "ilane", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("aida", "aide", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("ineza", "inez", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("nastilla", "nastille", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("lidia", "lidie", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("gerdia", "gerdie", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("arroniego", "arronie", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("istrida","istrid", {ogolne_leader_bie})]%%;\ + /set ogolne_leader_bie=$$[replace("vaea","vae", {ogolne_leader_bie})]%%;\ + /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_druzyna=%%{P5-DRUZYNA} %%;\ /_ustaw_druzyne%;\ /if ( {1} !~ "-q" )\ /repeat -1 1 /echo -p #@{BC%kolor_info}#@{n}# Team set, attack mode: @{BC%kolor_info}%opis_ataku@{n}.%;\ @@ -119,40 +119,40 @@ /set ogolne_druzyna_nar=$(/_l_odmien N %{ogolne_druzyna}) %;\ ; --- Wyjatki imion zle odmienialnych (biernik) --- ;; nightal - /set ogolne_druzyna_bie=$[replace("arda", "arde", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("rydharde", "rydharda", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("larella", "larelle", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("enta", "entu", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("tyrania", "tyranie", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("naraka", "naraku", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("isobella", "isobell", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("perla", "perle", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("ayrena", "ayren", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("venisa", "venise", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("maevea", "maeve", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("rteca", "rtec", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("myrela", "myrale", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("squibiea", "squibiego", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("rhera", "rhere", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("arda", "arde", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("rydharde", "rydharda", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("larella", "larelle", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("enta", "entu", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("tyrania", "tyranie", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("naraka", "naraku", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("isobella", "isobell", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("perla", "perle", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("ayrena", "ayren", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("venisa", "venise", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("maevea", "maeve", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("rteca", "rtec", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("myrela", "myrale", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("squibiea", "squibiego", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("rhera", "rhere", {ogolne_druzyna_bie})]%;\ ;; arkadia - /set ogolne_druzyna_bie=$[replace("myra", "myre", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("elikea", "elike", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("bara", "bare", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("necra", "necre", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("ayletta", "aylett", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("deliego", "deli", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("ilanea", "ilane", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("aida", "aide", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("ineza", "inez", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("nastilla", "nastille", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("lidia", "lidie", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("gerdia", "gerdie", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("arroniego", "arronie", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("istrida", "istrid", {ogolne_druzyna_bie})]%;\ - /set ogolne_druzyna_bie=$[replace("vaea", "vae", {ogolne_druzyna_bie})]%;\ - /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("myra", "myre", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("elikea", "elike", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("bara", "bare", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("necra", "necre", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("ayletta", "aylett", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("deliego", "deli", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("ilanea", "ilane", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("aida", "aide", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("ineza", "inez", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("nastilla", "nastille", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("lidia", "lidie", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("gerdia", "gerdie", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("arroniego", "arronie", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("istrida", "istrid", {ogolne_druzyna_bie})]%;\ + /set ogolne_druzyna_bie=$[replace("vaea", "vae", {ogolne_druzyna_bie})]%;\ + /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})]%;\ /_zaslona_binds /def _zaslona_binds = \ @@ -177,7 +177,7 @@ /def -mregexp -Fp3 -t'^%{_name}.* jest (w swietnej kondycji|w dobrym stanie|lekko rann(y|a)|rann(y|a)|w zlej kondycji|ciezko rann(y|a)|ledwo zyw(y|a)).' _zaslona_show_numbers_%{_numer_do_zaslony} = /return substitute(strcat("@{BCwhite}[ ", pad(strcat("F", %{_numer_do_zaslony}), -2), " ]@{n} ", {*}), "x", 1) %;\ /endif %;\ /let _numer_do_zaslony=$[{_numer_do_zaslony} + 1] %;\ - /done + /done /def _zaslona_bind_one = \ /if ({2} >= 12) \ diff --git a/nightal/combat.tf b/nightal/combat.tf index bdd5267..75a22ba 100644 --- a/nightal/combat.tf +++ b/nightal/combat.tf @@ -1,7 +1,7 @@ /def _atak = \ - /let n=$[strchr({*}, '|')]%;\ - /test param1 := substr({*}, 0, n)%;\ - /test param2 := substr({*}, n+1) %;\ + /let n=$[strchr({*}, '|')]%;\ + /test param1 := substr({*}, 0, n)%;\ + /test param2 := substr({*}, n+1) %;\ /if ( {attackmode} =~ "1" ) \ zabij %{param1} %; zabij %{param1} %;\ /elseif ( {attackmode} =~ "2" ) \