diff options
author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-29 17:37:57 +0000 |
---|---|---|
committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-05-29 17:37:57 +0000 |
commit | 0f670e5a6e960a8d06fc8f9f15440851c935411d (patch) | |
tree | 1889ac24bb7c7d5b94a056ffed9ac484a46f858a /npc/quests | |
parent | 613b76cccd9d71a2537d37d0a533afe68205da87 (diff) | |
download | hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.gz hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.bz2 hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.xz hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.zip |
Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps.
Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out.
Fixed an error in the monster race npcs calling a nonexistant OnEnable.
Renamed 'Tabb' in the 13.1 Draco egg daily quest to 'Taab'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14313 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests')
-rw-r--r-- | npc/quests/quests_13_2.txt | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index c06bfd4df..314fb7f5d 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.7 +//= 1.7a //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -27,6 +27,7 @@ //= 1.5 Added daily quests: Midgard Ore, and Alfheim Perfume. //= 1.6 Added the Yggdrasil Dungeon floor 2 puzzle. //= 1.7 Added daily quest 'Dragon Egg collection.' +//= 1.7a Fixed a translation typo. Tabb -> Taab. //============================================================ // Cat Hand Addition. @@ -4914,17 +4915,17 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{ } if (ep13_mdrama < 6) { mes "[Pinedel]"; - mes "Why isn't it working, Tabb?"; + mes "Why isn't it working, Taab?"; mes "That should be working."; next; - mes "[Tabb]"; + mes "[Taab]"; mes "That's very dangerous. Do you want to die..?!"; next; mes "[Pinedel]"; mes "Are you ignoring cute pets??"; mes "We've been able to get Pickys and even Zealotus!"; next; - mes "[Tabb]"; + mes "[Taab]"; mes "No way, even if you ask me..."; mes "Hillslion is very adorable..."; mes "But you can't."; @@ -4932,16 +4933,16 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{ mes "[Pinedel]"; mes "Then let me know why you object to this."; next; - mes "[Tabb]"; + mes "[Taab]"; mes "It's too dangerous. I've trained monsters before."; mes "Hillslions look cute and adorable, but it's not very realistic."; next; - mes "[Tabb]"; + mes "[Taab]"; mes "Can't you see that?"; mes "I've tried to train them... but I couldn't."; mes "How can we can train them as a cute pet...?"; next; - mes "[Tabb]"; + mes "[Taab]"; mes "It would definitely try to escape from us..."; mes "Then he would become very awful."; mes "I don't agree with this."; @@ -4956,7 +4957,7 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{ } else { mes "[Pinedel]"; - mes "Ah, Tabb isn't flexible at all."; + mes "Ah, Taab isn't flexible at all."; mes "Hey there! What's up??"; next; switch(select("Notice for criminal report:Cute pet investigation.")) { @@ -5104,11 +5105,11 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 982,{ mes "But I refuse to give up."; mes "I will make it into a cute pet someday."; next; - mes "[Tabb]"; + mes "[Taab]"; mes "Would you just give up making exogamous beings into cute pets..."; mes " "; mes "[Pinedel]"; - mes "Tabb doesn't have any guts!"; + mes "Taab doesn't have any guts!"; close; } } |