diff options
| author | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-14 08:53:30 +0000 |
|---|---|---|
| committer | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-14 08:53:30 +0000 |
| commit | 90d223ca0c9123f96f728e4553ef82fab2d93124 (patch) | |
| tree | 5b3bd3a432dfb77940cf47de60b9d04144b0e93e /npc | |
| parent | 5cdcd6c49aa88f9146698d2b03dcb48dada99e7f (diff) | |
| download | hercules-90d223ca0c9123f96f728e4553ef82fab2d93124.tar.gz hercules-90d223ca0c9123f96f728e4553ef82fab2d93124.tar.bz2 hercules-90d223ca0c9123f96f728e4553ef82fab2d93124.tar.xz hercules-90d223ca0c9123f96f728e4553ef82fab2d93124.zip | |
fixed nameless npc - assassin job quest
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8985 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 2 | ||||
| -rw-r--r-- | npc/jobs/2-1/assassin.txt | 18 |
2 files changed, 7 insertions, 13 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 2386ffc94..28f3f54cb 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -29,6 +29,8 @@ Playtester Date Added
======
+10/14
+ * Assassin Job quest: Fixed skipping of Nameless NPC [Lupus]
10/11
* Removed Free Pass from Kafra [Lupus]
- Now Kafra can use these tickets (Novice Grounds has to be updated!)
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 0af3aa114..7270ef617 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -3,7 +3,7 @@ //===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.3t
+//= 2.4
//===== Compatible With: =====================================
//= eAthena RC4
//===== Description: =========================================
@@ -30,7 +30,7 @@ //= 2.2 Merged back JFunc. Fixed missing dialogue [Lupus]
//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I
//= was still able to bypass it) [Toms]
-//= 2.3t Temp fix of: bypassing NPC and timer bug [Lupus]
+//= 2.4 Fixed skipping of Nameless NPC [Lupus]
//============================================================
@@ -533,22 +533,14 @@ sF_Quiz: // First Test
//****************************************************************************//
-// ----------------------------------------------------------------
-// Keeps the player from moving to far into the room.
-// This is to avoid cheaters who might try to take Bakardi's test first.
-//in_moc_16.gat,19,144,1 script getbacker 139,8,0,{
-// if(ASSIN_Q > 1) end;
-// warp "in_moc_16.gat",19,142;
-// addtimer 100, "Nameless One::OnTimer700";
-// end;
-//}
-
// Namelss One ====================================================
in_moc_16.gat,19,150,1 script Nameless One 139,8,6,{
OnTouch:
if(ASSIN_Q > 1) end;
-//OnTimer700:
+ warp "in_moc_16.gat",19,142;
+ sleep2 700;
+
if(ASSIN_Q == 1) goto L_ReTest;
set @LISTEN, 0;
|