summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-01 00:38:56 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-02-01 00:38:56 +0000
commitbbf4079daff28b4e18b82b6065fce619d5947a6f (patch)
treea51793e476a51d362fb7197fe2daad17ee8ea000 /npc
parenta72edd6f4b1c74d9766e4d8428c0952fbe748ee6 (diff)
downloadhercules-bbf4079daff28b4e18b82b6065fce619d5947a6f.tar.gz
hercules-bbf4079daff28b4e18b82b6065fce619d5947a6f.tar.bz2
hercules-bbf4079daff28b4e18b82b6065fce619d5947a6f.tar.xz
hercules-bbf4079daff28b4e18b82b6065fce619d5947a6f.zip
Started fixing bugreport:899 and fixed bugreport:875
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12156 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/guild/gldfunc_manager.txt5
-rw-r--r--npc/jobs/2-1/blacksmith.txt13
3 files changed, 8 insertions, 11 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d55d9427f..f1136d40d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2008/01/31
+ * Rev. 12156 Started fixing bugreport:899 and fixed bugreport:875 [L0ne_W0lf]
* Rev. 12155 Updated Lighthalzen Town NPCs and Speed Potion quest. [L0ne_W0lf]
2008/01/20
* Corrected one setcastledata call that I missed in r11915
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index 10d231fbf..fc737b6f2 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= jAthena - kalen (1.0) & eAthena Team
//===== Current Version: =====================================
-//= 1.9b
+//= 1.9c
//===== Compatible With: =====================================
//= eAthena SVN; RO Episode 4+
//===== Description: =========================================
@@ -40,6 +40,7 @@
//= 1.9 Fixed guild members being able to access Guild Master services. [L0ne_W0lf]
//= 1.9a Fixed Kafra cutin not closing if you choose not to dismiss her. [L0ne_W0lf]
//= 1.9b Corrected impropper variable being used for defense investment. [L0ne_W0lf]
+//= 1.9c Fixed a typo with zeny checkm when installing guardian. [L0ne_W0lf]
//============================================================
function script F_GldManager {
@@ -247,7 +248,7 @@ function script F_GldManager {
mes "Master, you have already have that Guardian. You cannot summon any more.";
return 0;
}
- if (Zeny < 1000) {
+ if (Zeny < 10000) {
mes "Well... I'm sorry but we don't have enough funds to summon the Guardian. We have failed to summon the Guardian.";
return 0;
}
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 55f206861..7effb742c 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -34,6 +34,7 @@
//= 2.4b Further bug fixes with teh hel of Barron-Monster. [L0ne_W0lf]
//= 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]
//==============================================================
ein_in01,18,28,4 script Guildsman#BLS 731,{
@@ -179,7 +180,7 @@ ein_in01,18,28,4 script Guildsman#BLS 731,{
mes "[Altiregen]";
mes "The test may consist of difficult tasks, but it's definitely not impossible. You will need to deliver certain items to different areas around the world";
mes "to complete the test.";
- break;
+ close;
case 3:
mes "[Altiregen]";
mes "Hmmm...";
@@ -296,12 +297,6 @@ ein_in01,201,27,3 script Guildsman#alberta 63,{
}
else if (BSMITH_Q == 1) {
mes "[Geschupenschte]";
- mes "Oh ho ho!";
- mes "You're a Merchant!";
- mes "Excellent! I was";
- mes "in need of some help!";
- next;
- mes "[Geschupenschte]";
mes "Am I correct in assuming you are the help sent by the Blacksmith Guild? There aren't many trustyworthy people I can hire to help me, so I'm always";
mes "short on help.";
next;
@@ -1474,7 +1469,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
next;
mes "[Mitehmaeeuh]";
mes "Take this Hammer";
- mes "of Blacksmith and go back to the Einbroch Blacksmith Guild. Okay then? I wish you the best of luck!";
+ mes "of Blacksmith and go back to the Altiregen. Okay then? I wish you the best of luck!";
close;
}
mes "You failed! You better study up before coming back here.";
@@ -1496,7 +1491,7 @@ ein_in01,24,41,5 script Blacksmith Guildsman#moc 726,{
mes "Yeap, you just passed the Blacksmith job test~";
next;
mes "[Mitehmaeeuh]";
- mes "Why don't you go back to Mr.Geschupenschte?";
+ mes "Why don't you go back to Mr.Altiregen?";
next;
mes "[Mitehmaeeuh]";
mes "Don't forget to bring the Hammer of Blacksmith with you!";