summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/events/alchemist.txt166
-rw-r--r--npc/events/custom/event_gefenia.txt57
-rw-r--r--npc/scripts_athena.conf13
-rw-r--r--npc/scripts_custom.conf12
5 files changed, 15 insertions, 237 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d3bf43090..16fe62925 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -26,6 +26,10 @@ KarLaeda
Date Added
======
+2007/01/29
+ * Moved the custom events entries into scripts_custom.conf
+ * Removed old custom geffenia warper since TSQ is done
+ * Removed the duplicit and untranslated alchemist.txt event [ultramage]
2007/01/26
* More typo fixes
* Added a missing dialogue branch in novice.txt
diff --git a/npc/events/alchemist.txt b/npc/events/alchemist.txt
deleted file mode 100644
index 42250d5dc..000000000
--- a/npc/events/alchemist.txt
+++ /dev/null
@@ -1,166 +0,0 @@
-//===========================================================
-//Alchemist Event script 2004/02/14 by kalen
-//===========================================================
-
-ama_in02.gat,61,27,6 script �B���p�t 749,{
- mes "[�O���S���[]";
- mes "�L�L�L�L�L�P�P�P�P�P�I";
- mes "�����ׂ����ʂ��o���I";
- mes "����Ȏ������ʂ��o���̂�";
- mes "���܂�ď��߂Ă��I";
- next;
- mes "[�O���S���[]";
- mes "����Ȃɉ����܂ŗ��Ď��̔\�͂�";
- mes "�����ł���Ƃ͎v�������Ȃ��������I";
- mes "���Ɏd���𗊂܂ꂽ���c�c";
- mes "�z�͈ӊO�ɂ������낢�z���������B";
- next;
- mes "[�O���S���[]";
- mes "�N�N�N�c�c�������C���‚��˂΁c�c";
- mes "�����‚̒������@�������‚���ꂽ��";
- mes "���񂾓z���΂𕬂��ē{��c�c";
- mes "�P�P�P�P�c�c";
- next;
- mes "[�O���S���[]";
- mes "��A�Ƃ���Ŏ��ɉ����p���H";
- mes "�ό��ŗ�����Ȃ�Â��ɑ��ł�";
- mes "���Ă����񂾂ȁB";
- mes "�����Ȃ��΃A�V�b�h�{�g��";
- mes "�ł������킹�Ă�邼�I�L�L�c�c";
- next;
- menu "���炵�܂���",L1,"����`�����鎖�ł�����܂����H",L2;
-L1:
- mes "[�O���S���[]";
- mes "�悵�悵�c�c";
- mes "���������Ă������ɖY���B";
- mes "���ꂪ����������R�c���c�c";
- mes "�L�L�L�L�L�c�c";
- close;
-L2:
- mes "[�O���S���[]";
- mes "��`���ƁH";
- mes "�������c�c";
- mes "�������̊�������̂͂���������";
- mes "��������B�L�L�L�L�L�c�c";
- next;
- mes "[�O���S���[]";
- mes "������������̂ɕK�v�ȑ����΂�";
- mes "�����‚��p�ӂ��Ă����Ƃ��肪�����B";
- mes "�������Ă��镨�����邩�H";
- next;
- menu "������",L2_1,"�����‚�����܂�",L2_2;
-L2_1:
- mes "[�O���S���[]";
- mes "����Ȃ猾�����B";
- mes "�ǂ�ł��������瓯����ނ�";
- mes "�����΂�8�‚��W�߂Ăق����B";
- mes "��������΁A�����ǂ�����";
- mes "�ς��Ă�邼�B";
- next;
- mes "[�O���S���[]";
- mes "�����Ԉ�������������Ă�����A";
- mes "�����Ƀt�@�C�A�[�{�g����";
- mes "�����邼�I";
- next;
- mes "[�O���S���[]";
- mes "����ł́A��`���ƌ������ȏ�";
- mes "�񑩂͎��񂾂��I�L�L�L�L�c�c";
- close;
-L2_2:
- mes "[�O���S���[]";
- mes "�悵�A���������Ă���H";
- next;
- menu "�~�X�e�B�b�N�t���[�Y��",L2_2_1,"�O���C�g�l�C�`��",L2_2_2,"�t���C���n�[�g",L2_2_3,"���t�E�B���h",L2_2_4;
- L2_2_1:
- if (countitem(995) < 8) goto Llowitem;
- mes "[�O���S���[]";
- mes "�����8�‚����炤�����";
- mes "���̑����΂������Ă�낤�B";
- mes "�����������Ȃ����낤�H";
- next;
- mes "[�O���S���[]";
- mes "�ق�A�ǂ����낤���H";
- next;
- menu "�O���C�g�l�C�`��",L2_2_1_1,"�t���C���n�[�g",L2_2_1_2,"���t�E�B���h",L2_2_1_3,"�������߂�",LEnd;
-L2_2_1_1:
- delitem 995,8;getitem 997,1;goto Lfinal;
-L2_2_1_2:
- delitem 995,8;getitem 994,1;goto Lfinal;
-L2_2_1_3:
- delitem 995,8;getitem 996,1;goto Lfinal;
- L2_2_2:
- if (countitem(997) < 8) goto Llowitem;
- mes "[�O���S���[]";
- mes "�����8�‚����炤�����";
- mes "���̑����΂������Ă�낤�B";
- mes "�����������Ȃ����낤�H";
- next;
- mes "[�O���S���[]";
- mes "�ق�A�ǂ����낤���H";
- next;
- menu "�~�X�e�B�b�N�t���[�Y��",L2_2_2_1,"�t���C���n�[�g",L2_2_2_2,"���t�E�B���h",L2_2_2_3,"�������߂�",LEnd;
-L2_2_2_1:
- delitem 997,8;getitem 995,1;goto Lfinal;
-L2_2_2_2:
- delitem 997,8;getitem 994,1;goto Lfinal;
-L2_2_2_3:
- delitem 997,8;getitem 996,1;goto Lfinal;
- L2_2_3:
- if (countitem(994) < 8) goto Llowitem;
- mes "[�O���S���[]";
- mes "�����8�‚����炤�����";
- mes "���̑����΂������Ă�낤�B";
- mes "�����������Ȃ����낤�H";
- next;
- mes "[�O���S���[]";
- mes "�ق�A�ǂ����낤���H";
- next;
- menu "�~�X�e�B�b�N�t���[�Y��",L2_2_3_1,"�O���C�g�l�C�`��",L2_2_3_2,"���t�E�B���h",L2_2_3_3,"�������߂�",LEnd;
-L2_2_3_1:
- delitem 994,8;getitem 995,1;goto Lfinal;
-L2_2_3_2:
- delitem 994,8;getitem 997,1;goto Lfinal;
-L2_2_3_3:
- delitem 994,8;getitem 996,1;goto Lfinal;
- L2_2_4:
- if (countitem(996) < 8) goto Llowitem;
- mes "[�O���S���[]";
- mes "�����8�‚����炤�����";
- mes "���̑����΂������Ă�낤�B";
- mes "�����������Ȃ����낤�H";
- next;
- mes "[�O���S���[]";
- mes "�ق�A�ǂ����낤���H";
- next;
- menu "�~�X�e�B�b�N�t���[�Y��",L2_2_4_1,"�O���C�g�l�C�`��",L2_2_4_2,"�t���C���n�[�g",L2_2_4_3,"�������߂�",LEnd;
-L2_2_4_1:
- delitem 996,8;getitem 995,1;goto Lfinal;
-L2_2_4_2:
- delitem 996,8;getitem 997,1;goto Lfinal;
-L2_2_4_3:
- delitem 996,8;getitem 994,1;goto Lfinal;
-Lfinal:
- mes "[�O���S���[]";
- mes "�W�W�W�c�c�K���K���S���c�c";
- mes "���ށA�ł����B";
- mes "�ق�A�厖�Ɏg���悤�ɁB";
- mes "�܂�����Ύ����Ă��Ȃ����B";
- close;
-Llowitem:
- mes "[�O���S���[]";
- mes "�W�W�W�c�c�K���K���S���c�c";
- mes "��c�c�����΂͂ǂ������H";
- mes "�ǂ����łȂ����Ă������H";
- next;
- mes "[�O���S���[]";
- mes "�܂������Ă��Ȃ����I";
- mes "��`���ƌ������ȏ�";
- mes "�񑩂͎��񂾂��I�L�L�L�L�c�c";
- close;
-LEnd:
- mes "[�O���S���[]";
- mes "���c�c�܂��������c�c";
- mes "���������ɋ��邱�Ƃ͓��������B";
- mes "�񑩂����I";
- close;
-}
diff --git a/npc/events/custom/event_gefenia.txt b/npc/events/custom/event_gefenia.txt
deleted file mode 100644
index 191ce43db..000000000
--- a/npc/events/custom/event_gefenia.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-//===== eAthena Script ========================================
-//= Gefenia Warper Script
-//===== By: ==================================================
-//= [Muad_Dib] 1.0a
-//===== Current Version: =====================================
-//= 1.0a
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 6+
-//===== Description: =========================================
-//= Temp Gefenia Warper
-//===== Additional Comments: =================================
-//= 07/06/05 : Added 1st Version. [Muad_Dib]
-//= Converted to eAthena format by Dr.Evil
-//============================================================
-
-
-gefenia01.gat,132,169,5 script Explorer#1 740,{
- mes "[Explorer]";
- mes "Do you really want to go back??";
- next;
- menu "Yes.",-,"No.",M_END;
-
- warp "gef_dun03.gat", 138, 117;
- end;
-
-M_END:
- mes "Ok, don't come back until you want to leave this place.";
- close;
-}
-
-gef_dun03.gat,131,118,6 script Explorer#2 740,{
- mes "[Explorer]";
- mes "Hi...";
- next;
- mes "[Explorer]";
- mes "I can send you to the ^FF3300Geffenia City Ruins^000000... You just need the Key!.";
- mes "Do you have the Key? It looks like a crystal.";
- next;
- menu "Yes, I Got the key.",-,"No, I'll go look for it.",M_END;
-
- if (countitem(7025) < 1) goto L_NOKEY; // Item: Lucifer's Lament
- mes "[Explorer]";
- mes "Good, you got the right key! Let's go!";
- next;
- warp "gefenia01.gat", 136, 166;
- end;
-
-M_END:
- mes "[Explorer]";
- mes "Don't come back until you have the key!";
- close;
-
-L_NOKEY:
- mes "[Explorer]";
- mes "Sorry.. you don't have the key...";
- close;
-} \ No newline at end of file
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index 3def90721..8424eda78 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -167,21 +167,8 @@ npc: npc/kafras/kafras_new.txt
//Official kRO, idRO Skill Reset Event
//npc: npc/events/event_skill_reset.txt
-//A custom event for 3 holidays: X-Mas, Karachun and New Year
-//Should be activated between 8 December and 8 January
-//npc: npc/events/custom/xmas_rings_event.txt
-//npc: npc/events/alchemist.txt
//npc: npc/events/whiteday.txt
//npc: npc/events/twintowers.txt
-//npc: npc/events/custom/uneasy_cemetery.txt
-//npc: npc/events/custom/draculax.txt
-//npc: npc/events/custom/event_gefenia.txt
-//npc: npc/events/custom/npc_event_thesign.txt
-//npc: npc/events/custom/2006_dogs_year.txt
-//npc: npc/events/custom/valentinesdayexp.txt
-//| Poring track files
-//npc: npc/events/custom/p_track/p_track_core.txt
-//npc: npc/events/custom/p_track/p_track_warpers.txt
// --------------------------------------------------------------
// --------------------------- Others ---------------------------
npc: npc/other/pvp.txt
diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf
index 3618f96cf..f7e609f06 100644
--- a/npc/scripts_custom.conf
+++ b/npc/scripts_custom.conf
@@ -138,7 +138,17 @@ npc: npc/custom/adoption.txt
//npc: npc/custom/quests/umbalian_language.txt
// Custom Kiel Mansion Dungeon Quest
//npc: npc/custom/quests/kiel_quest.txt
+//A custom event for 3 holidays: X-Mas, Karachun and New Year
+//Should be activated between 8 December and 8 January
+//npc: npc/events/custom/xmas_rings_event.txt
//Grand Circlet Quest combined with Excalibur Quest
//npc: npc/events/custom/kings_items.txt
//Custom Halloween Event (gives )
-//npc: npc/events/custom/hallow06.txt \ No newline at end of file
+//npc: npc/events/custom/hallow06.txt
+//npc: npc/events/custom/uneasy_cemetery.txt
+//npc: npc/events/custom/draculax.txt
+//npc: npc/events/custom/2006_dogs_year.txt
+//npc: npc/events/custom/valentinesdayexp.txt
+//| Poring track files
+//npc: npc/events/custom/p_track/p_track_core.txt
+//npc: npc/events/custom/p_track/p_track_warpers.txt