diff options
author | thatakkarin <thatakkarin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-29 16:20:40 +0000 |
---|---|---|
committer | thatakkarin <thatakkarin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-29 16:20:40 +0000 |
commit | 5855956aa1e10b8c3213e479c975493b2e96aeeb (patch) | |
tree | 8fe716fa546d8f3488e28bb2df3b1f5d16b15312 | |
parent | 9b02e0156ddee963d690b21fb98549cea0a0ccda (diff) | |
download | hercules-5855956aa1e10b8c3213e479c975493b2e96aeeb.tar.gz hercules-5855956aa1e10b8c3213e479c975493b2e96aeeb.tar.bz2 hercules-5855956aa1e10b8c3213e479c975493b2e96aeeb.tar.xz hercules-5855956aa1e10b8c3213e479c975493b2e96aeeb.zip |
* Removed Non-English sample files from doc/sample/ (bugreport:6750)
- sample/npc_test_ev.txt was originally used to demonstrate nifty event related commands.
- sample/npc_test_arena.txt is rather defunct as there are fully working scripts within npc/ that demonstrate the same functionality.
- sample/npc_test_str.txt explains how StRing != striNG. This is documented in doc/script_commands.txt
* Slight update to CMakeLists.txt for README.txt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16982 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | doc/sample/npc_test_arena.txt | 104 | ||||
-rw-r--r-- | doc/sample/npc_test_ev.txt | 146 | ||||
-rw-r--r-- | doc/sample/npc_test_str.txt | 26 |
4 files changed, 1 insertions, 277 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 31ca33c50..f8432dc03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -481,6 +481,7 @@ set( RUNTIME_FILES "${CMAKE_CURRENT_SOURCE_DIR}/map-server.sh" "${CMAKE_CURRENT_SOURCE_DIR}/mapserv-sql.bat" "${CMAKE_CURRENT_SOURCE_DIR}/pcre3.dll" + "${CMAKE_CURRENT_SOURCE_DIR}/README.txt" "${CMAKE_CURRENT_SOURCE_DIR}/runserver-sql.bat" "${CMAKE_CURRENT_SOURCE_DIR}/serv.bat" "${CMAKE_CURRENT_SOURCE_DIR}/start" @@ -492,7 +493,6 @@ set( RUNTIME_DIRECTORIES "doc" "log" "npc" - "readme" "sql-files" "tools" ) diff --git a/doc/sample/npc_test_arena.txt b/doc/sample/npc_test_arena.txt deleted file mode 100644 index 2ba093d03..000000000 --- a/doc/sample/npc_test_arena.txt +++ /dev/null @@ -1,104 +0,0 @@ -// ------------------------------------------------------------------ -// �A���|�i�̐ݒ� -// ------------------------------------------------------------------ - -// ���̃}�b�v���g���܂� -//map: prontera -//map: prt_are_in -//map: force_1-1 - -// �e���|�Ȃǂ̋֎~���� -prt_are_in mapflag nomemo dummy -prt_are_in mapflag noteleport dummy -prt_are_in mapflag nosave prontera,156,191 -force_1-1 mapflag nomemo dummy -force_1-1 mapflag noteleport dummy -force_1-1 mapflag nosave prontera,156,191 - -// �v�����e���ɓ������u�� -prontera,160,185,0 script �A���[�i����� 116,{ - mes "�A���[�i������ɔ�т܂����H"; - next; - menu "���",L_GOARENA,"��߂�",L_YAME; -L_GOARENA: - warp "prt_are_in",31,82; - close; -L_YAME: - close; -} - -// �ҋ@�����珀�����ւ̓]�� -prt_are_in,29,79,0 script �^�C���A�^�b�N�P 116,{ - if( getmapusers("force_1-1")>0 ) goto L_WAIT; - mes "�����̓^�C���A�^�b�NLv1�ł�"; - mes "���킵�܂����H"; - menu "�͂�",L_GOLV1,"��߂�",L_YAME; -L_GOLV1: - if( getmapusers("force_1-1")>0 ) goto L_WAIT; - disablenpc "fc103-1"; - disablenpc "fc105"; - disablenpc "fc107"; - addtimer 5000,"arenatestev0000"; - warp "force_1-1",99,12; - end; -L_WAIT: - mes "���ݒ��풆�̕������܂��̂ŁA"; - mes "���炭���҂����������B"; -L_YAME: - close; -} - -// �������i�P�O�b�������ԁj -force_1-1,99,12,0 script arenatestev0000 -1,{ - announce "�P�O�b��ɊJ�n���܂�",3; - addtimer 10000,"arenatestev0001"; -} - -// ���ۂ̕����ւ̓]����MOB�̐ݒ� -force_1-1,99,12,0 script arenatestev0001 -1,{ - killmonster "force_1-1","arenatestev1000"; - monster "force_1-1",25,25,"--ja--",1002,1,"arenatestev1000"; - monster "force_1-1",20,25,"--ja--",1002,1,"arenatestev1000"; - monster "force_1-1",25,20,"--ja--",1002,1,"arenatestev1000"; - monster "force_1-1",30,25,"--ja--",1002,1,"arenatestev1000"; - monster "force_1-1",25,30,"--ja--",1002,1,"arenatestev1000"; - set $arenatest00,5; - disablenpc "fc101"; - disablenpc "fc103"; - warp "force_1-1",25,26; - enablenpc "fc103-1"; - enablenpc "fc105"; - enablenpc "fc107"; - announce "30�b�ȓ��ɟr�ł���",19; - addtimer 30000,"arenatestev8000"; -} - -// �|�������� -force_1-1,25,26,0 script arenatestev1000 -1,{ - set $arenatest00, $arenatest00 - 1; - if( $arenatest00 > 0 ) goto L_CONT; - deltimer "arenatestev8000"; - announce "�N���b�V��!!",3; - enablenpc "fc101"; - enablenpc "fc103"; - areaannounce "prt_are_in",25,75,40,90, - strcharinfo(0) + " ���^�C���A�^�b�NLv1���N���A���܂���",0; - addtimer 5000,"arenatestev9000"; -L_CONT: - end; -} - -// �^�C���A�E�g -force_1-1,25,26,0 script arenatestev8000 -1,{ - set $arenatest00,99; - killmonster "force_1-1","arenatestev1000"; - announce "�^�C���I�[�o�[!!",3; - areaannounce "prt_are_in",25,75,40,90, - strcharinfo(0) + " ���^�C���A�^�b�NLv1�Ɏ��s���܂���",0; - addtimer 5000,"arenatestev9000"; -} - -// �v�����e���ɋA�� -force_1-1,25,26,0 script arenatestev9000 -1,{ - warp "prontera",156,191; -}
\ No newline at end of file diff --git a/doc/sample/npc_test_ev.txt b/doc/sample/npc_test_ev.txt deleted file mode 100644 index cc170373e..000000000 --- a/doc/sample/npc_test_ev.txt +++ /dev/null @@ -1,146 +0,0 @@ -// �C�x���g�̃e�X�g�Ɖ�� -// - - -// * NPC�̕\���N���X��-1�ɂ���ƃC�x���g�ɂȂ�A���s�\�ɂȂ�܂��B -// * �ʏ��NPC�ł��ȉ��̃��x���t���C�x���g���g�����ƂŃC�x���g�ɂȂ�܂��B -// * NPC�X�N���v�g��On�`�Ŏn�܂郉�x�����`����ƁA -// ���x���t���̃C�x���g�Ƃ��ăG�N�X�|�[�g���A���s�\�ɂȂ�܂��B -// * NPC�C�x���g��"NPC��(or�C�x���g��)::���x����"�Ƃ���ƁA -// �w�肵�����x��������s�ł��܂��B -// * ���x������24�o�C�g�ȓ��ɂ��ĉ������B - - -// ------------------------------------------------------------------ -// �C�x���g�̋N������/�N����� -// ------------------------------------------------------------------ - -// 1.doevent�R�}���h�ŋN���� -// 2.MOB��|�����Ƃ��ɋN���� -// �@a. �X�N���v�gmonster�R�}���h�̑�V�����ŃC�x���g����ݒ� -// b. monster�̔z�u�̍Ō�̈����ŃC�x���g����ݒ� -// 3.�}�b�v���������ɋN����iOnInit�j -// 4.NPC�`���b�g���[���������ɂȂ����Ƃ��ɋN���� -// 5.���v�ɂ���ċN���� -// (OnMinute??,OnHour??,OnClock????,OnDate????) : ?�͐��� - -// 3,5�̏������C�x���g�A���v�C�x���g�́A�Ώۂ�PC�������Ȃ��C�x���g�ɂȂ�܂� -// �����PC��ΏۂƂ���X�N���v�g���g�����Ƃ͏o���܂���B -// �܂��Aannounce�R�}���h�Ȃǂ�0x08�t���O���w�肵��NPC��̂ɂ���K�v������܂� - -// ----------�C�x���g�쓮�̃T���v�� ------------- -// �N���b�N����ƃC�x���g�uevent_test2�v���N����NPC -prontera,155,180,0 script ev_do�e�X�g 116,{ - doevent "event_test2"; -} - -// ----------MOB�ɂ��C�x���g�쓮�̃T���v�� ------------- -// �|���ƃC�x���g�uevent_test�v���N���������X�^�[��[����] -prontera,150,185,0 script ev_mob�e�X�g 116,{ - monster "this",0,0,"Event_Mob2",1002,1,"event_test"; -} - -// ----------MOB�ɂ��C�x���g�쓮�̃T���v��2------------- -// �|���ƃC�x���g�uevent_test3�v���N���������X�^�[��[�z�u] -prontera,150,180,0 monster Event_Mob 1008,1,0,0,event_test3 - -// ----------�^�C�}�ɂ��C�x���g�쓮�̃T���v�� ------------- -// �N���b�N����ƂT�b��Ƀ��x���uOnTimer�v�����s����NPC -// �i�C�x���g���ɁuNPC��::On�`�Ŏn�܂郉�x���v���w�肷��ƃ��x�������s�ł���j -prontera,155,185,0 script ev_timer�e�X�g 116,{ - addtimer 5000,"ev_timer�e�X�g::OnTimer"; - end; -OnTimer: - mes "�T�b�o���܂���"; - close; -} - -// ----------OnInit/�`���b�g���[���ɂ��C�x���g�쓮�̃T���v�� ------------- -// �}�b�v�T�[�o�[�N�����Ƀ��x���uOnInit�v�����s����A�`���b�g����� -// �܂��Awaitingroom�̑�3�����ɃC�x���g��ݒ肷�� -prontera,145,180,0 script ev_init�e�X�g 116,{ - end; -OnInit: - waitingroom "OnInit�e�X�g",1,"ev_init�e�X�g::OnMax"; - end; -OnMax: - warpwaitingpc "prontera",155,190; - end; - -} - -// ----------���v�ɂ��C�x���g�쓮�̃T���v�� ------------- -// �w��̎�������t�ŃC�x���g�����s���� -// announce��0x08�t���O���w�肵�Ă���Ƃ���ɒ��ӂ��Ă��������B -prontera,145,185,0 script ev_clock�e�X�g 116,{ - end; -// ����5�� -OnMinute05: - announce "�����T�������m�点���܂�",8; - end; -// ����12��(24H) -OnHour12: - announce "���߂̃j���[�X�ł�",8; - end; -// 23��59�� -OnClock2359: - announce "���ƂP���Ŗ����ł�",8; - end; -// �P���P�� -OnDate0101: - announce "�����܂��Ă��߂łƂ��������܂�",8; - end; -} - - -// ------------------------------------------------------------------ -// �C�x���g�X�N���v�g�̍��� -// ------------------------------------------------------------------ -// �\���N���X��-1�ɂ���ƃC�x���g�����ɂȂ�A���O���C�x���g���ɂȂ�B -// �G���A���w�肵�Ȃ��ꍇ�A�����}�b�v�����C�x���g���N�����͈͂ɂȂ�B -// �G���A���w�肷��ꍇ�A����-1�ɂ���Ɠ����}�b�v�I�Ȃ�}�b�v������Ă� -// �쓮����B�G���A�͔��a�ł���B�Ȃ��A�C�x���g�̋N����ʒu�Ƃ����̂́A -// �ΏۂƂȂ�PC�̍��W�ł���B���Ƃ��A�������U����MOB��|�����Ƃ��� -// �N����C�x���g��MOB�̍��W�ł͂Ȃ��APC�̍��W�Ȃ̂Œ��ӁB - -// ----------�C�x���g�ŁA�G���A�͎w�肵�Ă��Ȃ��T���v��------------ -// �����}�b�v���ŃC�x���g�uevent_test�v���N����Ǝ��s����� -prontera,150,185,0 script event_test -1,{ - announce strcharinfo(0) + " ������MOB��|���܂���",2; - close; -} - -// ----------�C�x���g�ŁA�G���A���w�肵���T���v��------------ -// (155,185)���甼�a5�Z���ȓ��ŃC�x���g�uevent_test2�v���N����Ǝ��s����� -prontera,155,180,0 script event_test2 -1,5,5 { - announce "�T�Z���ȓ��ŃN���b�N���܂�����",19; - close; -} - -// ----------�C�x���g�ŁA�G���A��-1�ɂ����T���v��------------ -// �����}�b�v�I�ŃC�x���g�uevent_test3�v���N����Ǝ��s����� -prontera,150,180,0 script event_test3 -1,-1,-1 { - mes "�z�uMOB�|���܂�����"; - close; -} - - - -// ------------------------------------------------------------------ -// �C�x���g�}�b�v�p�̐ݒ� -// ------------------------------------------------------------------ -// �i�S�ăR�����g�A�E�g���Ă܂��j - -// ----------�Z�[�u�֎~�̃T���v��--------- -// ���̃}�b�v�Ń��O�A�E�g����ƁA�K�� �v�����e�� �̍��W(156,190)�� -// �Z�[�u����� -//prontera mapflag nosave prontera,156,190 - -// ----------�����֎~�̃T���v��--------- -// ���̃}�b�v�ł̓������Ƃ�Ȃ� -//prontera mapflag nomemo dummy - -// ----------�e���|�֎~�̃T���v��--------- -// ���̃}�b�v�ł͔��A���A�e���|�A�|�^���g���Ȃ� -// ���ӁF�X�N���v�g��warp��"Random","SavePoint"�������ɂȂ�܂� -//prontera mapflag noteleport dummy
\ No newline at end of file diff --git a/doc/sample/npc_test_str.txt b/doc/sample/npc_test_str.txt deleted file mode 100644 index ad3532c4a..000000000 --- a/doc/sample/npc_test_str.txt +++ /dev/null @@ -1,26 +0,0 @@ -//===== rAthena Script ======================================= -//= Sample: String Test -//===== By: ================================================== -//= rAthena Dev Team -//===== Current Version: ===================================== -//= 20070315 -//===== Description: ========================================= -//= An example of string comparisons. -//============================================================ - -prontera,164,188,1 script sTrInG2compare 112,{ - set @str$, "StRiNg1"; - mes "sTrInG2 isn't equal to " + @str$ ; - mes "Our Var is equal to " + @str$ + " ...OK?"; - next; - mes "Comparison eqOK�F" + (@str$=="StRiNg1"); - mes "Comparison eqNG�F" + (@str$=="sTrInG2"); - mes "Comparison neOK�F" + (@str$!="00000"); - mes "Comparison neNG�F" + (@str$!="StRiNg1"); - mes "Comparison gtOK�F" + ("aab">"aaa"); - mes "Comparison ltNG�F" + ("aab"<"aaa"); - next; - input @str2$; - mes "You've entered '" + @str2$ + "' string."; - close; -}
\ No newline at end of file |