diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-01-30 00:25:44 +0000 |
| commit | 741230435bd23aa692f552649664b67a43a358c0 (patch) | |
| tree | 2f659f9ff3ed0c2b3df3119315047b6f756ef135 /npc/custom/quests/thq/THQS_Quests.txt | |
| parent | d21f2f8479c618c15958ae1f9ac5811b9b035921 (diff) | |
| download | hercules-741230435bd23aa692f552649664b67a43a358c0.tar.gz hercules-741230435bd23aa692f552649664b67a43a358c0.tar.bz2 hercules-741230435bd23aa692f552649664b67a43a358c0.tar.xz hercules-741230435bd23aa692f552649664b67a43a358c0.zip | |
* Merged changes from trunk [14636:14686/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14687 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/custom/quests/thq/THQS_Quests.txt')
| -rw-r--r-- | npc/custom/quests/thq/THQS_Quests.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index b50082943..8e6a79b70 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -10,7 +10,7 @@ // revised By Warlock // ////////////////////////////////////////////////////////////// //===== Version ============================================== -//= 1.4 +//= 1.5 //===== Compatible With ====================================== //= eAthena 1.0 //===== Description ========================================== @@ -22,6 +22,7 @@ //= 1.2 some bugfixes, typos [Lupus] //= 1.3 Removed Duplicates [Silent] //= 1.4 Further removed duplicates. [L0ne_W0lf] +//= 1.5 Fixed name collision with 'Little Girl' in cities/lutie.txt [Ai4rei] //============================================================ @@ -671,7 +672,7 @@ N_QuestStart: } ///////Job list 7/////// //7-1 goes to 8-1 using callfunc; -prontera,123,208,6 script Little Girl 717,{ +prontera,123,208,6 script Little Girl#thq 717,{ if (seven_qset == 1 && countitem(531) > 4) goto N_QuestComp; if (seven_qset == 1) goto N_QuestStart; if (eight_qset == 1) goto N_QuestStart2; |