From 526e9b131555525128b8a866cb345aaa26fc1483 Mon Sep 17 00:00:00 2001 From: SinSloth Date: Sun, 5 Aug 2007 09:25:53 +0000 Subject: * Set default Rachel NPCs as kRO ones (with mask).No more debate please. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10949 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/cities/rachel.txt | 19 +++++++++---------- npc/quests/quests_rachel.txt | 28 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 9dce00722..c23c2b78f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2007/08/05 + * Set default Rachel NPCs as kRO ones (with mask).No more debate please. [SinSloth] 2007/08/04 * Rev. 10948 Several bug-fixes to various Rachel quests (Gepard) [L0ne_W0lf] * Small fix to the level 4 weapon quest. diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index 653c11470..e08202d7c 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -210,9 +210,8 @@ ra_fild12,45,230,3 script Airship Guide#Fild 934,{ close; } - -//rachel,201,174,3 script Freya's Follower 926,{ -rachel,201,174,3 script Freya's Follower 927,{ +//rachel,201,174,3 script Freya's Follower 927,{ +rachel,201,174,3 script Freya's Follower 926,{ mes "[Freya's Follower]"; mes "All of Arunafeltz believes"; mes "in the goddess Freya, but"; @@ -329,7 +328,7 @@ rachel,197,137,3 script Bard#aru 51,{ close; } -ra_temple,148,91,3 script Follower Akarna 917,{ +ra_temple,148,91,3 script Follower Akarna 916,{ mes "[Follower Akarna]"; mes "Cheshrumnir..."; mes "It is said that one"; @@ -340,7 +339,7 @@ ra_temple,148,91,3 script Follower Akarna 917,{ close; } -ra_temple,115,148,7 script Follower Yakum 917,{ +ra_temple,115,148,7 script Follower Yakum 916,{ mes "[Follower Yakum]"; mes "......"; mes "........."; @@ -354,7 +353,7 @@ ra_temple,115,148,7 script Follower Yakum 917,{ close; } -ra_temin,287,88,7 script Follower Lekua 927,{ +ra_temin,287,88,7 script Follower Lekua 926,{ mes "[Follower Lekua]"; mes "Look at these flowers."; mes "Aren't they so beautiful?"; @@ -370,8 +369,8 @@ ra_temin,287,88,7 script Follower Lekua 927,{ close; } -//ra_temin,228,303,5 script Freya's Follower#in1 926,{ -ra_temin,228,303,5 script Freya's Follower#in1 927,{ +//ra_temin,228,303,5 script Freya's Follower#in1 927,{ +ra_temin,228,303,5 script Freya's Follower#in1 926,{ mes "[Freya's Follower]"; mes "Once atain, I didn't get"; mes "any sleep yesterday... I'm"; @@ -382,8 +381,8 @@ ra_temin,228,303,5 script Freya's Follower#in1 927,{ close; } -//ra_temin,230,303,3 script Freya's Follower#in2 926,{ -ra_temin,230,303,3 script Freya's Follower#in2 927,{ +//ra_temin,230,303,3 script Freya's Follower#in2 927,{ +ra_temin,230,303,3 script Freya's Follower#in2 926,{ mes "[Freya's Follower]"; mes "You have done well,"; mes "my brother. I am certain"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 267803a8f..6de585782 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -2728,9 +2728,9 @@ ra_in01,255,25,0 script Book#ra_in 111,{ //line below (npc header), and comment the line //under it, and then uncomment the cutin lines. -//rachel,157,183,3 script Sincere Follower Urstia 916,{ -rachel,157,183,3 script Sincere Follower Urstia 917,{ - //cutin "ra_usti1",2; +//rachel,157,183,3 script Sincere Follower Urstia 917,{ +rachel,157,183,3 script Sincere Follower Urstia 916,{ + cutin "ra_usti1",2; if (ice_necklace_q < 1) { mes "[Urstialla]"; mes "Oh, are you an adventurer"; @@ -2926,7 +2926,7 @@ rachel,157,183,3 script Sincere Follower Urstia 917,{ L_End: close2; - //cutin "",255; + cutin "",255; end; } @@ -5900,7 +5900,7 @@ L_End: end; } -ra_temin,134,128,3 script Pope's Office Guard#rac::raofficeguard 927,{ +ra_temin,134,128,3 script Pope's Office Guard#rac::raofficeguard 926,{ if (MISC_QUEST & 8192) { mes "[Pope's Office Guard]"; mes "I'm sorry, but the pope"; @@ -5961,7 +5961,7 @@ ra_temin,134,128,3 script Pope's Office Guard#rac::raofficeguard 927,{ } -ra_temin,134,134,3 duplicate(raofficeguard) Pope's Office Guard#2ra 927 +ra_temin,134,134,3 duplicate(raofficeguard) Pope's Office Guard#2ra 926 ra_temin,134,131,0 script gyoin1#rachel 45,1,1,{ OnTouch: @@ -5991,14 +5991,14 @@ ra_temsky,95,99,6 script Priest#1rachel 935,{ close; } -ra_temsky,93,97,6 script Male Follower#1rachel::ramale 927,{ +ra_temsky,93,97,6 script Male Follower#1rachel::ramale 926,{ mes "[Male Follower]"; mes "May Freya be with you."; close; } -ra_temsky,90,95,6 duplicate(ramale) Male Follower#2rachel 927 -ra_temsky,98,59,6 duplicate(ramale) Male Follower#3rachel 927 +ra_temsky,90,95,6 duplicate(ramale) Male Follower#2rachel 926 +ra_temsky,98,59,6 duplicate(ramale) Male Follower#3rachel 926 ra_temsky,104,99,4 script Priestess#1rachel 920,{ mes "[Priestess]"; @@ -6006,14 +6006,14 @@ ra_temsky,104,99,4 script Priestess#1rachel 920,{ close; } -ra_temsky,106,97,4 script Female Follower#1rachel::rafemale 917,{ +ra_temsky,106,97,4 script Female Follower#1rachel::rafemale 916,{ mes "[Female Follower]"; mes "May Freya be with you."; close; } -ra_temsky,108,95,4 duplicate(rafemale) Female Follower#2rachel 917 -ra_temsky,101,59,4 duplicate(rafemale) Female Follower#3rachel 917 +ra_temsky,108,95,4 duplicate(rafemale) Female Follower#2rachel 916 +ra_temsky,101,59,4 duplicate(rafemale) Female Follower#3rachel 916 ra_temsky,99,99,5 script Pope#rachel 936,{ if (ra_tem_q == 16) { @@ -6546,8 +6546,8 @@ OnTouch: end; } -//rachel,142,167,5 script Seeking Follower#rachel 916,6,6,{ -rachel,142,167,5 script Seeking Follower#rachel 917,6,6,{ +//rachel,142,167,5 script Seeking Follower#rachel 917,6,6,{ +rachel,142,167,5 script Seeking Follower#rachel 916,6,6,{ if ((lost_boy == 13) && (ra_tem_q == 20)) { mes "[Arunafeltz Follower]"; mes "Excuse me, but"; -- cgit v1.2.3-60-g2f50