summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-14 01:07:46 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-14 01:07:46 +0000
commitcc8f6a1b73b905cfe602499aa2d34d7f0d75219d (patch)
treea67bbf34520cca4954cc801d1744b8920e8bc1ab /npc
parent116a244ef2d1a45ea89d5e782aa69546e8eb0a89 (diff)
downloadhercules-cc8f6a1b73b905cfe602499aa2d34d7f0d75219d.tar.gz
hercules-cc8f6a1b73b905cfe602499aa2d34d7f0d75219d.tar.bz2
hercules-cc8f6a1b73b905cfe602499aa2d34d7f0d75219d.tar.xz
hercules-cc8f6a1b73b905cfe602499aa2d34d7f0d75219d.zip
Maheo in Ice dungeon quest now uses setnpcdisplay.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11906 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/quests/quests_rachel.txt26
2 files changed, 7 insertions, 20 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index a344a1b5d..cf0ad3e90 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/12/13
+ * Rev. 11907 Maheo in Ice dungeon quest now uses setnpcdisplay. [L0ne_W0lf]
* Rev. 11906 Minor fixes, guild manager, and a couple others. [L0ne_W0lf]
- bugreport:579, attempt at fixing bugreport:581
- Fixed a typo in the hunter quest. (Not noticable really.)
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 7360c41d5..d286e7cff 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,16 +3,11 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 2.1
+//= 2.2
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
//= Collection of Rachel Quests
-//= * Lost Child
-//= * Bruspetti
-//= * Ice Necklace
-//= * Sanctuary/donation
-//===== Comments: ============================================
//= Lost Child Quest:
//= - End of quest coincides with opening the Sanctuary.
//= - Variable in use: lost_boy (max 13)
@@ -50,6 +45,7 @@
//= 1.9 Fixed a misorder with variable checkings. [SinSloth]
//= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 2.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 2.2 Maheo NPC now uses "setnpcdisplay" instead of two NPCs. [L0ne_W0lf]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@@ -3169,8 +3165,7 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
mes "^3355FF*Pzzzzz*";
mes "*CRASH!*^000000";
next;
- enablenpc "Maheo#cave";
- disablenpc "Man Stuck in Ice#cave";
+ setnpcdisplay "Man Stuck in Ice#cave",937;
emotion e_gasp;
mes "[Maheo]";
mes "Finally...!";
@@ -3229,10 +3224,10 @@ ice_dun02,120,105,3 script Man Stuck in Ice#cave 924,5,5,{
delitem 7572,1; //Ashy_Necklace
delitem 7569,1; //Wind Hammer
set ice_necklace_q,5;
- enablenpc "Man Stuck in Ice#cave";
- disablenpc "Maheo#cave";
+ close2;
cutin "",255;
- close;
+ setnpcdisplay "Man Stuck in Ice#cave",924;
+ end;
}
OnTouch:
@@ -3415,15 +3410,6 @@ rachel,265,98,3 script Hamion#aru 930,{
}
-ice_dun02,120,105,3 script Maheo#cave 937,{
- enablenpc "Man Stuck in Ice#cave";
- disablenpc "Maheo#cave";
- end;
-OnInit:
- disablenpc "Maheo#cave";
- end;
-}
-
rachel,113,96,5 script Mohadian 929,10,10,{
if (ice_necklace_q == 6) {
mes "[Mohadian]";