Wyniesienie wyjatkow do priv_dir.

This commit is contained in:
Bartek Stalewski 2014-07-16 16:56:56 +02:00
parent 4f9da740a3
commit 6ac1d5a8b0
4 changed files with 36 additions and 100 deletions

7
common/stdexceptions.tf Normal file
View file

@ -0,0 +1,7 @@
/def _exceptions_leader = \
/set ogolne_leader_bie=$[replace("zla_odmiana1", "dobra_odmiana1", {ogolne_leader_bie})]%;\
/set ogolne_leader_bie=$[replace("zla_odmiana2", "dobra_odmiana2", {ogolne_leader_bie})]
/def _exceptions_team = \
/set ogolne_druzyna_bie=$[replace("zla_odmiana1", "dobra_odmiana1", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("zla_odmiana2", "dobra_odmiana2", {ogolne_druzyna_bie})]

View file

@ -65,3 +65,5 @@
;; Poniższe linie powinny zostać:
;;
/echo -p #@{C%c_info}#@{n}# Loaded settings for: @{C%c_info}%{player}@{n}.
/eval /load %{priv_dir}/%{mudworld}/exceptions.tf

View file

@ -58,58 +58,16 @@
/set ogolne_druzyna=%%{P1} %%;\
/_ustaw_druzyne %%;\
/repeat -1 1 /tablica_druzyny %;\
/def -ag -mregexp -t'Druzyne prowadzi (.*)( i oprocz ciebie (sa|jest) w niej jeszcze(: | )([^.]*)\\\\.$$|, zas ty jestes jej jedynym czlonkiem.)' __druzyna_tmp_3a= \
/am 1 %%;\
/set ogolne_leader=$$[{P1}] %%;\
/set ogolne_leader=$$[escape("\\\\",escape("()",{ogolne_leader}))] %%;\
/set ogolne_leader_dop=$$(/_l_odmien D %%{ogolne_leader}) %%;\
/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})]%%;\
;; 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_leader_bie=$$[replace("aylinna", "aylinn", {ogolne_leader_bie})]%%;\
/set ogolne_leader_bie=$$[replace("dahira", "dahire", {ogolne_leader_bie})]%%;\
/set ogolne_leader_bie=$$[replace("shinra", "shinru", {ogolne_leader_bie})]%%;\
/set ogolne_leader_bie=$$[replace("fuega", "fuego", {ogolne_leader_bie})]%%;\
/set ogolne_leader_bie=$$[replace("itlina", "itlin", {ogolne_leader_bie})]%%;\
/set ogolne_leader_bie=$$[replace("valeria", "valerio", {ogolne_leader_bie})]%%;\
/set ogolne_leader_bie=$$[replace("vandrea", "vandree", {ogolne_leader_bie})]%%;\
/set ogolne_druzyna=%%{P5-DRUZYNA} %%;\
/_ustaw_druzyne%;\
/def -ag -mregexp -t'Druzyne prowadzi (.*)( i oprocz ciebie (sa|jest) w niej jeszcze(: | )([^.]*)\\\\.$$|, zas ty jestes jej jedynym czlonkiem.)' __druzyna_tmp_3a= \
/am 1 %%;\
/set ogolne_leader=$$[{P1}] %%;\
/set ogolne_leader=$$[escape("\\\\",escape("()",{ogolne_leader}))] %%;\
/set ogolne_leader_dop=$$(/_l_odmien D %%{ogolne_leader}) %%;\
/set ogolne_leader_bie=$$(/_l_odmien B %%{ogolne_leader}) %%;\
/set ogolne_leader_nar=$$(/_l_odmien N %%{ogolne_leader}) %%;\
/_exceptions_leader %%;\
/set ogolne_druzyna=%%{P5-DRUZYNA} %%;\
/_ustaw_druzyne%;\
/if ( {1} !~ "-q" )\
/eval /echo -p #@{C%c_info}#@{n}# Team set, attack mode: @{C%c_info}%opis_ataku@{n}.%;\
/endif
@ -124,49 +82,7 @@
/set ogolne_druzyna_dop=$(/_l_odmien D %{ogolne_druzyna}) %;\
/set ogolne_druzyna_bie=$(/_l_odmien B %{ogolne_druzyna}) %;\
/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})]%;\
;; 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("aylinna", "aylinn", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("dahira", "dahire", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("shinra", "shinru", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("fuega", "fuego", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("itlina", "itlin", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("valeria", "valerio", {ogolne_druzyna_bie})]%;\
/set ogolne_druzyna_bie=$[replace("vandrea", "vandree", {ogolne_druzyna_bie})]%;\
/_exceptions_team %;\
/_zaslona_binds
/def _zaslona_binds = \

View file

@ -1,4 +1,3 @@
;/def -p20 -q -h'PROMPT *Aby zalogowac sie na istniejaca postac*' login_hook0 = \
/def -mregexp -Fp2 -t'Aby zalogowac sie na istniejaca postac' login_hook0 = \
/purge login_hook* %;\
/def -mregexp -1 -F -h'SEND ([^ ]*)' login_hook1 = \
@ -6,6 +5,7 @@
/set player=$$[tolower({P0})] %%;\
/set mudworld=$${world_name} %%;\
/eval /cd %%{main_dir}/common %%;\
/_dir_sprawdz %%;\
/_login_sprawdz %%;\
/load colorscheme.tf %%;\
/load sets.tf %%;\
@ -24,6 +24,7 @@
/set player=$$[tolower({P0})] %%;\
/set mudworld=$${world_name} %%;\
/eval /cd %%{main_dir}/common %%;\
/_dir_sprawdz %%;\
/_login_sprawdz %%;\
/load colorscheme.tf %%;\
/load sets.tf %%;\
@ -35,12 +36,22 @@
/eval /load %%{priv_dir}/%%{mudworld}/players/%%{player}/%%{player}.tf %%;\
/eval /load %%{priv_dir}/%%{mudworld}/players/%%{player}/imiona.tf
/def _dir_sprawdz = \
/quote -S -dexec !\
if [ ! -d %{priv_dir}/%{mudworld} ]; then \
mkdir -p %{priv_dir}/%{mudworld}; \
touch %{priv_dir}/%{mudworld}/imiona.tf; \
cp ../common/stdexceptions.tf %{priv_dir}/%{mudworld}/exceptions.tf; \
fi
/def _login_sprawdz = \
/quote -S -dexec !\
if [ ! -d %{priv_dir}/%{mudworld}/players/%{player} ]; then \
if [ ! -f %{priv_dir}/%{mudworld}/players/%{player}/%{player}.tf ]; then \
mkdir -p %{priv_dir}/%{mudworld}/players/%{player}; \
cp ../common/stdplayer.tf %{priv_dir}/%{mudworld}/players/%{player}/%{player}.tf; \
touch %{priv_dir}/%{mudworld}/players/%{player}/lista.tf; \
fi
;/def -mregexp -Fp2 -t'Aby zalogowac sie na istniejaca postac - podaj jej imie.' autoimie = /send
fi; \
if [ ! -f %{priv_dir}/%{mudworld}/exceptions.tf ]; then \
cp ../common/stdexceptions.tf %{priv_dir}/%{mudworld}/exceptions.tf; \
fi; \
touch %{priv_dir}/%{mudworld}/imiona.tf