summaryrefslogtreecommitdiff
path: root/npc/cities/rachel.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
committershennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
commit7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch)
tree715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/cities/rachel.txt
parenta2405882a4123d6a11d24e895b40148dc7cb455e (diff)
parentbd04c6c566902d03d633b4dfee5335361155a79e (diff)
downloadhercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/cities/rachel.txt')
-rw-r--r--npc/cities/rachel.txt20
1 files changed, 11 insertions, 9 deletions
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index 88eb359f1..455db505e 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -4,9 +4,9 @@
//= First Version: Tsuyuki and Harp
//= iRO Version: L0ne_W0lf
//===== Current Version: =====================================
-//= 0.9
+//= 0.9a
//===== Description: =========================================
-//= [Partial Aegis Conversion]
+//= [Partial Official Conversion]
//= Arunafeltz NPCs
//===== Additional Comments: =================================
//= 0.5 Text translated from Korean > English, incomplete,
@@ -15,6 +15,7 @@
//= 0.7 Total update of most if not all NPCs. [L0ne_W0lf]
//= 0.8 Updated "Frozen Boy" dialog. (euRO) [L0ne_W0lf]
//= 0.9 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 0.9a Added 'consumeitem' command. [Euphy]
//============================================================
//===== Set 1 ================================================
@@ -273,7 +274,7 @@ rachel,206,30,3 script Freya's Priest#play 920,{
mes "[Freya's Priest]";
mes "You!";
mes "Entertain me!";
- Emotion e_ag;
+ emotion e_ag;
next;
if (select("What? You can't tell me what to do!:You got it.") == 1) {
mes "[Freya's Priest]";
@@ -306,11 +307,12 @@ rachel,206,30,3 script Freya's Priest#play 920,{
mes "Oh? Oh! That's wonderful!";
close2;
set .@play,rand(1,10);
- if (.@play == 1) warp "Random",0,0;
- else if (.@play == 2) warp "Random",0,0;
- else if (.@play == 3) sc_start SC_MOVHASTE_INFINITY,5000,0;
- else if (.@play == 4) sc_start SC_MOVHASTE_INFINITY,5000,0;
- else sc_start SC_SlowDown,5000,0;
+ if (.@play < 3)
+ consumeitem 601; //Wing_Of_Fly
+ else if (.@play < 5)
+ consumeitem 12016; //Speed_Up_Potion
+ else
+ consumeitem 12017; //Slow_Down_Potion
end;
}
@@ -338,7 +340,7 @@ rachel,197,137,3 script Bard#aru 51,{
mes ".........";
mes ".........";
mes ".........";
- Emotion e_sob;
+ emotion e_sob;
close;
}