summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-06 06:03:25 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-10-06 06:03:25 +0000
commit90bb183a7ee4eddf031fa3a1e939c79b33bd5129 (patch)
treea7e7beed8eecfc5eb64acab2836bf240e075874a
parentefc28eef0d1471af7de7fd1bcec8e8ec9ff809f7 (diff)
downloadhercules-90bb183a7ee4eddf031fa3a1e939c79b33bd5129.tar.gz
hercules-90bb183a7ee4eddf031fa3a1e939c79b33bd5129.tar.bz2
hercules-90bb183a7ee4eddf031fa3a1e939c79b33bd5129.tar.xz
hercules-90bb183a7ee4eddf031fa3a1e939c79b33bd5129.zip
fixed timer error, mobscript bug, overlapped npcs
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8942 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/cities/niflheim.txt20
-rw-r--r--npc/jobs/1-1/swordman.txt4
-rw-r--r--npc/other/msg_boards.txt19
-rw-r--r--npc/quests/first_class/tu_magician01.txt10
5 files changed, 27 insertions, 29 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 833a58c0d..b2e06aa03 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -29,6 +29,9 @@ Playtester
Date Added
======
+10/06
+ * Many minor fixes, thanks to theultramage [Lupus]
+ - Fixed "mymob" Niflheim bug, fixed Sworman Job Quest timer issue, fixed overlapping NPCs.
10/05
* Fixed typo [Vicious]
* Umbala: Added official chance of failure to Create Essence (u may get a Garlet instead) [Lupus]
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 865e3031e..6c20f0141 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -4,7 +4,7 @@
//= Fyrien, Dizzy, PKGINGO
//= Official NPCs translated and re-edited by Celest
//===== Current Version: =====================================
-//= 1.3
+//= 1.3a
//===== Compatible With: =====================================
//= Any eAthena Version; Niflheim Required
//===== Description: =========================================
@@ -137,7 +137,7 @@ L_end:
}
niflheim.gat,350,258,5 script Cursed Soul 802,{
- killmonster "niflheim.gat","mymob";
+ killmonster "niflheim.gat","OnNFMob";
mes "[Ashe Bruce]";
mes "I feel a strong curse on youaaaahhhhh";
mes "I shall deny your existanceahhhhhhh";
@@ -151,7 +151,7 @@ L_book1:
mes "Don't you touch my bookssssahhh!!";
mes "Ahahaha, I curse you for being bitten, torn and clawed at!!";
mes "Forever binded to this curse!!";
- monster "niflheim.gat",350,258,"Rideword",1478,1,"mymob";
+ monster "niflheim.gat",350,258,"Rideword",1478,1,"OnNFMob";
close;
L_book2:
@@ -192,13 +192,13 @@ L_book3:
mes "Hahahaha!! Your prayers were wrong!!";
mes "Time to face deathohohohoho,";
mes "May you be cursed forevahahahaha!!";
- monster "niflheim.gat",349,256,"Orc Skeleton",1462,1,"mymob";
- monster "niflheim.gat",347,258,"Orc Skeleton",1462,1,"mymob";
- monster "niflheim.gat",347,254,"Orc Skeleton",1462,1,"mymob";
- monster "niflheim.gat",350,252,"Orc Skeleton",1462,1,"mymob";
- monster "niflheim.gat",344,255,"Orc Skeleton",1462,1,"mymob";
- monster "niflheim.gat",348,252,"Orc Skeleton",1462,1,"mymob";
- monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"mymob";
+ monster "niflheim.gat",349,256,"Orc Skeleton",1462,1,"OnNFMob";
+ monster "niflheim.gat",347,258,"Orc Skeleton",1462,1,"OnNFMob";
+ monster "niflheim.gat",347,254,"Orc Skeleton",1462,1,"OnNFMob";
+ monster "niflheim.gat",350,252,"Orc Skeleton",1462,1,"OnNFMob";
+ monster "niflheim.gat",344,255,"Orc Skeleton",1462,1,"OnNFMob";
+ monster "niflheim.gat",348,252,"Orc Skeleton",1462,1,"OnNFMob";
+ monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"OnNFMob";
close;
L_back:
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 530c23a3e..9af07c0d5 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.6
+//= 1.6a
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -313,7 +313,7 @@ sword_1-1.gat,1,1,0 script TimerSwrdmn -1,{
areaannounce "sword_1-1.gat", 0, 0, 400, 400, "[Test Hall Staff]: Your times up! You failed the test.",0;
end;
OnTimer428000:
- stopnpctimer "TimerSwrdmn";
+ stopnpctimer;
warp "izlude_in.gat",39,170;
end;
}
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index 01b264dbb..f4db8751c 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.3
+//= 1.3a
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -30,11 +30,11 @@ aldebaran.gat,133,104,1 script Welcome Sign::ws_aldebaran 111,{
// Alberta //
//=======================================================================//
// Sign: Alberta Harbor -----------------------------------------------
-alberta.gat,35,241,1 script Alberta Harbor 111,{
- mes "~sign reads....~";
- mes "Welcome to the port city Alberta! Alberta is the city of the sea! A tourist delight!";
- close;
-}
+//alberta.gat,35,241,1 script Alberta Harbor 111,{
+// mes "~sign reads....~";
+// mes "Welcome to the port city Alberta! Alberta is the city of the sea! A tourist delight!";
+// close;
+//}
// Welcome Sign -----------------------------------------------
alberta.gat,196,152,1 script Welcome Sign::ws_alberta 111,{
@@ -63,13 +63,6 @@ geffen.gat,116,58,1 script Welcome Sign::ws_geffen 111,{
close;
}
-// Sign: Mage Association ---------------------------------------
-geffen.gat,61,174,1 script Mage Association 111,{
- mes "~sign reads...~";
- mes "Greetings!! This is the Geffen Magic Academy. Come in if you have an interest in all things magic!";
- close;
-}
-
// Sign: Geffen Tower Sign ----------------------------------------------
geffen.gat,113,104,1 script Geffen Tower 111,{
mes "~sign reads...~";
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index a20accb4a..16e7131df 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -16,10 +16,12 @@
//=================================================Sign====================================================
-//geffen.gat,61,174,4 script Sign#M 111,{ // Bad coordinates [Jukka]
-// mes "- Mage Job Change -";
-// close;
-//}
+geffen.gat,61,174,4 script Sign#M 111,{
+ mes "~sign reads...~";
+ mes "Greetings!! This is the Geffen Magic Academy. Come in if you have an interest in all things magic!";
+ close;
+}
+
//=================================================New Mage Manager====================================================
geffen.gat,67,180,4 script New Mage Manager#M 102,{