summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-17 22:04:23 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-17 22:04:23 +0000
commite909ba974598914ed5ce9cddee6107aadacbadfa (patch)
tree95b69f8164644fd3bba9d29dc07eadbfdf196a7b
parent3dbd88048beb03fef4d35a625d0329d74e71907b (diff)
downloadhercules-e909ba974598914ed5ce9cddee6107aadacbadfa.tar.gz
hercules-e909ba974598914ed5ce9cddee6107aadacbadfa.tar.bz2
hercules-e909ba974598914ed5ce9cddee6107aadacbadfa.tar.xz
hercules-e909ba974598914ed5ce9cddee6107aadacbadfa.zip
* Corrected some issues in the Keil Hyre Quest and Mjolnir Seal quest.
- Corrected Sudri not setting player and NPC hp variables. (bugreport:2355) - Corrected a few minor typos in the Kyle Hyre Quest. (bugreport:2356) - Corrected bad if condition checking in Kyle Hyre Quest. (bugreport:2358) - Corrected Mjolnir seal checking for Oridecon hammer. (bugreport:2363) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13305 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt6
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt12
-rw-r--r--npc/quests/seals/mjolnir_seal.txt10
3 files changed, 21 insertions, 7 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 72fc730fe..a60cb7f25 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,11 @@
Date Added
======
+2008/10/17
+ * Rev. 13305 Corrected some issues in the Keil Hyre Quest and Mjolnir Seal quest. [L0ne_W0lf]
+ - Corrected Sudri not setting player and NPC hp variables. (bugreport:2355)
+ - Corrected a few minor typos in the Kyle Hyre Quest. (bugreport:2356)
+ - Corrected bad if condition checking in Kyle Hyre Quest. (bugreport:2358)
+ - Corrected Mjolnir seal checking for Oridecon hammer. (bugreport:2363)
2008/10/16
* Rev. 13295 Corrected typo in Nameless Monestary quest. (bugreport:2352) [L0ne_W0lf]
* Swapped baseclass for basejob and fixed server-wide announce in god item quests. (bugreport:2349)
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 48986c66f..f53482910 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf (Script), DZeroX (Timer)
//===== Current Version: =====================================
-//= 4.2c
+//= 4.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -92,6 +92,8 @@
//= 4.2a Follow up to last update. [L0ne_W0lf]
//= 4.2b Missed a condition, fixed it though. [L0ne_W0lf]
//= 4.2c More various fixes :D [L0ne_W0lf]
+//= 4.3 Fixed improper condition in the Elly NPC. [L0ne_W0lf]
+//= Corrected some typos in the dialogs.
//============================================================
//============================================================================
@@ -1429,7 +1431,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
mes "[Elly]";
mes "This place certainly";
mes "isn't like other schools.";
- mes "You already know that only";
+ //mes "You already know that only";
mes "Yeah, everything is made to";
mes "fit each of the student's needs.";
next;
@@ -1492,7 +1494,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
}
}
}
- else if (KielHyreQuest >= 24 || KielHyreQuest <= 26) {
+ else if (KielHyreQuest >= 24 && KielHyreQuest <= 26) {
cutin "kh_elly04",2;
mes "[Elly]";
mes "Argh, I'm in a fix!";
@@ -4899,7 +4901,7 @@ kh_mansion,18,30,4 script Allysia 894,{
mes "[Allysia]";
mes "With their organic bodies";
mes "and advanced artificial hearts";
- mes "make from imitation Ymir Heart";
+ mes "made from imitation Ymir Heart";
mes "Pieces, they can experience";
mes "physiologic phenomena";
mes "just like ordinary humans.";
@@ -5063,7 +5065,7 @@ OnTouch:
mes "son and heir, Kiehl, helped";
mes "his father establish this";
mes "special academy as their";
- mes "way of giving back t society.";
+ mes "way of giving back to society.";
next;
mes "[??????]";
mes "Almost every corporation and";
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 7313551e8..7c8c88467 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= SinSloth
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena
//===== Description: =========================================
@@ -16,6 +16,8 @@
//= 1.3 Minor Touchups to quest. [L0ne_W0lf]
//= 1.4 Optimizing refine method and wrong close2. [Zephyrus]
//= 1.5 Fixed Trans classes being assigned random reward. [L0ne_W0lf]
+//= 1.6 Fixed checking for Oridecon Hammer. [L0ne_W0lf]
+//= Corrected Sudi's and player's HP settings.
//============================================================
prontera,124,297,3 script Tialfi 706,{
@@ -1050,6 +1052,8 @@ mjolnir_09,209,341,3 script Dwarf Blacksmith#south 826,{
}
}
else if(god_mjo_2 == 1) {
+ set .@n_vit,200;
+ set .@p_vit,100;
while(1) {
mes "Sudri : " + .@n_vit + " HP";
mes "" + strcharinfo(0) + " : " + .@p_vit + " HP";
@@ -1456,6 +1460,8 @@ mjolnir_09,209,341,3 script Dwarf Blacksmith#south 826,{
mes "[Sudri]";
mes "Cool, let's fight!";
next;
+ set .@n_vit,200;
+ set .@p_vit,100;
while(1) {
mes "Sudri : " + .@n_vit + " HP";
mes "" + strcharinfo(0) + " : " + .@p_vit + " HP";
@@ -2021,7 +2027,7 @@ mjolnir_01,35,136,7 script Dwarf Blacksmith#west 826,{
close;
}
- if (countitem(615) > 0) {
+ if (countitem(984) > 0) {
delitem 984,1; //Oridecon
}
else {