summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-22 06:16:21 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-22 06:16:21 +0000
commitdec3ae611b85e2ce1d01a572a0d07d0e2907408b (patch)
tree1f12484f992422b34b1e3b029ba973aeb43fce20 /npc/jobs
parentb8d9d3ef71cb8d93bb8173c8c04e8d3d1798b187 (diff)
downloadhercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.tar.gz
hercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.tar.bz2
hercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.tar.xz
hercules-dec3ae611b85e2ce1d01a572a0d07d0e2907408b.zip
* Several small fixes to scripts, and updates.
- Updated City warps for Lighthalzen, and dugneon warps. - Updated castle warps for Schwaltzvalt Castles Map. - "The Sign" quest is now enabled by default. (bugreport:1011) - Added Dimensional Gorge map spawns (According to RO Future Wiki) - Updated Lighthalzen boss spawning mechanisim to official. - Fixed a small error in the novice potion exchanger. - Resolves the following: bugreport:879 bugreport:973 bugreport:983 bugreport:1013 bugreport:1021 bugreport:1024 bugreport:1026 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12227 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/2-1/blacksmith.txt5
-rw-r--r--npc/jobs/2-1/wizard.txt5
-rw-r--r--npc/jobs/2-2/bard.txt6
-rw-r--r--npc/jobs/2-2/rogue.txt8
4 files changed, 15 insertions, 9 deletions
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 7effb742c..c7721045f 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -7,7 +7,7 @@
//= Optimized and further edited by kobra_k88.
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.4c
+//= 2.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -35,6 +35,7 @@
//= 2.4c More fixes courtosy of Micktu. [L0ne_W0lf]
//= 2.4d Fixed an incorrect answer in the quiz. (Trojal) [L0ne_W0lf]
//= 2.4e Touched up a few issues as pointed out by Ultramage. [L0ne_W0lf]
+//= 2.5 Krongast is in Lighthalzen. (DarkValmir) [L0ne_W0lf]
//==============================================================
ein_in01,18,28,4 script Guildsman#BLS 731,{
@@ -685,7 +686,7 @@ L_AskQuestions:
next;
mes "[Geschupenschte]";
mes "Anyway, take this";
- mes "to ^8E6B23Krongast^000000 in Izlude";
+ mes "to ^8E6B23Krongast^000000 in Lighthalzen";
break;
case 12:
mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt.";
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index 8b40063f4..6dceefcf1 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -4,7 +4,7 @@
//= (Aegis) Translated by yoshiki, converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.5c
+//= 2.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 2.5a More bugfixes care of Barron-Monster. [L0ne_W0lf]
//= 2.5b Fixed tests calling on a non-existant label in "Room of x#Failed" npcs. [L0ne_W0lf]
//= 2.5c Bug fixes. Cleaned up some NPCs slightly. [L0ne_W0lf]
+//= 2.6 Fixed Water Room not warping on time-up. [L0ne_W0lf]
//============================================================
gef_tower,111,37,4 script Wizard Guildsman 70,{
@@ -1142,7 +1143,7 @@ OnTimer183000:
end;
OnTimer184000:
- donpcevent "Room of Water#Failed::OnEnable";
+ enablenpc "Room of Water#Failed";
end;
OnTimer185000:
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index b1c91ecec..d9e03963e 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib(The Prometheus Project), Lupus, Samuray22
//===== Current Version: =====================================
-//= 2.3
+//= 2.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= - Temporary character variables "@" are now ".@"
//= - Fixed some indentation.
//= - Changed item names to item IDs
+//= 2.4 Fixed hang up on bard quest. ($kiN.) [L0ne_W0lf]
//============================================================
//=============== Ayealo ============================
@@ -331,6 +332,9 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "[Lalo]";
mes "You can get this flower from the girl in Prontera.";
mes "Please bring me a different flower.";
+ close2;
+ cutin "job_bard_aiolo02",255;
+ end;
}
else if(countitem(744) > 0) {
mes "Oh no, you brought a Bouquet?";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 3ee0f5eab..1fc53589c 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1275,7 +1275,7 @@ OnTouch:
end;
OnDisable:
- killmonster "in_rogue","gen_ro#1";
+ killmonster "in_rogue","gen_ro#1::OnMyMobDead";
end;
}
@@ -1290,7 +1290,7 @@ OnTouch:
end;
OnDisable:
- killmonster "in_rogue","gen_ro#2";
+ killmonster "in_rogue","gen_ro#2::OnMyMobDead";
end;
}
@@ -1306,7 +1306,7 @@ OnTouch:
end;
OnDisable:
- killmonster "in_rogue","gen_ro#3";
+ killmonster "in_rogue","gen_ro#3::OnMyMobDead";
end;
}
@@ -1321,7 +1321,7 @@ OnTouch:
end;
OnDisable:
- killmonster "in_rogue","gen_ro#4";
+ killmonster "in_rogue","gen_ro#4::OnMyMobDead";
end;
}