summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-03-13 05:12:15 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-03-13 05:12:15 +0000
commit8494f218353c4806cb1f98c44fb3dfe820c07b9a (patch)
tree2d17052586a430227d71a2427063786095663d0d /npc
parent2943a827e95482fa9b222e41c24d0a1fda717f76 (diff)
downloadhercules-8494f218353c4806cb1f98c44fb3dfe820c07b9a.tar.gz
hercules-8494f218353c4806cb1f98c44fb3dfe820c07b9a.tar.bz2
hercules-8494f218353c4806cb1f98c44fb3dfe820c07b9a.tar.xz
hercules-8494f218353c4806cb1f98c44fb3dfe820c07b9a.zip
* More bug fixing! Lots of little things, really.
- Corrected some condition errors in quests_veins. (bugreport:4088) - Corrected specialeffects so they play on the right NPC. (bugreport:4090) - Corrected an item ID in the reward NPC in monster races. (bugreport:4092) - Corrected NPCs overlapping with quests in msg_boards (bugreport:4093) - Corrected some of the given errors in the 2007_relay quest. (bugreport:4094) - Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102) - Commented out duplicate library curator in prontera city. (bugreport:4105) - Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt12
-rw-r--r--npc/cities/prontera.txt6
-rw-r--r--npc/events/halloween_2006.txt19
-rw-r--r--npc/instances/SealedShrine.txt37
-rw-r--r--npc/other/monster_race.txt5
-rw-r--r--npc/other/msg_boards.txt12
-rw-r--r--npc/quests/2007_relay.txt16
-rw-r--r--npc/quests/quests_rachel.txt11
-rw-r--r--npc/quests/quests_veins.txt19
9 files changed, 86 insertions, 51 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index aa5176c34..cf64acfd9 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,16 @@
Date Added
======
-2010/-3/04
+2010/03/13
+ * Rev. 14262 More bug fixing! Lots of little things, really. [L0ne_w0lf]
+ - Corrected some condition errors in quests_veins. (bugreport:4088)
+ - Corrected specialeffects so they play on the right NPC. (bugreport:4090)
+ - Corrected an item ID in the reward NPC in monster races. (bugreport:4092)
+ - Corrected NPCs overlapping with quests in msg_boards (bugreport:4093)
+ - Corrected some of the given errors in the 2007_relay quest. (bugreport:4094)
+ - Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102)
+ - Commented out duplicate library curator in prontera city. (bugreport:4105)
+ - Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117)
+2010/03/04
* Rev. 14259 Fixed unidentified_coin -> unidentified_mineral in quests_13_2. (bugreport:4086) [L0ne_W0lf]
2010/03/03
* Rev. 14258 Some bug fixing! Hoorah for me not feeling lazy! [L0ne_W0lf]
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index f3f3b3023..e48074e08 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.0
+//= 2.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.8 Moved Culvert to quests/quests_prontera.txt
//= 1.9 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= 2.0 Removed "Hans Solo", as he is a Jawaii NPC. [L0ne_W0lf]
+//= 2.1 Disabled the Library Curator (bugreport:4105) [L0ne_W0lf]
//============================================================
// Prontera
@@ -238,6 +239,8 @@ prontera,78,150,3 script Dairenne#pront 90,{
// inside Prontera
//============================================================
+/*
+//This NPC has been disabled officiall.
prt_in,178,92,0 script Curator of Library#pront 57,{
mes "[Curator Guiss]";
mes "Here, in the Western branch of the Prontera Library, ";
@@ -252,6 +255,7 @@ prt_in,178,92,0 script Curator of Library#pront 57,{
mes "If you would like to peruse monster records organized by their properties, please visit the Eastern branch of our library.";
close;
}
+*/
prt_in,175,50,0 script Library Girl#pront 71,{
mes "[Library Girl Ellen]";
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index d124f0ec8..f92f5a995 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Brainstorm
//===== Current Version: =====================================
-//= 1.3a
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.2 Added missing checkweights. [L0ne_W0lf]
//= 1.3 Replaced effect numerics with constants. [L0ne_W0lf]
//= 1.3a Replaced effect numerics with constants (1 was missed). [Samuray22]
+//= 1.4 Effects are now played by proper NPC. [L0ne_W0lf]
//============================================================
// Pumpkin Mojo quest (Event 1)
@@ -29,6 +30,14 @@ OnTouch:
mes "just talk to me.";
mes "You won't even understand what stupid pumkin headed Jack is saying.";
close;
+
+OnEffect:
+ specialeffect EF_LEVEL99;
+ end;
+
+OnEffect2:
+ specialeffect EF_HIT2;
+ end;
}
prontera,164,69,3 script Cool Devi#06_hw 738,{
@@ -113,7 +122,7 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{
mes "[Cool Devi]";
mes "says he.";
next;
- specialeffect EF_LEVEL99;
+ donpcevent "Gloomy Jack#06_hw::OnEffect";
mes "[Excited Jack]";
mes "Lalala~ lalala~";
mes " ";
@@ -122,7 +131,7 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{
delitem 5134,1; //Pumpkin_Hat
getitem 5202,1; //Pumpkin_Hat_
next;
- specialeffect EF_HIT2;
+ donpcevent "Gloomy Jack#06_hw::OnEffect2";
mes "[Gloomy Jack]";
mes "My aura is not like it used to be. Maybe I need more Pumpkin Mojo.";
mes " ";
@@ -157,7 +166,7 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{
mes "[Cool Devi]";
mes "says he.";
next;
- specialeffect EF_LEVEL99;
+ donpcevent "Gloomy Jack#06_hw::OnEffect";
mes "[Excited Jack]";
mes "Lalala~ lalala~";
mes " ";
@@ -167,7 +176,7 @@ prontera,164,69,3 script Cool Devi#06_hw 738,{
delitem 2226, 1;//Cap
getitem 5202, 1;//Pumpkin_Hat_
next;
- specialeffect EF_HIT2;
+ donpcevent "Gloomy Jack#06_hw::OnEffect2";
mes "[Gloomy Jack]";
mes "My aura is not like it used to be. Maybe I need more Pumpkin Mojo.";
mes " ";
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index f9def604a..db5f837f6 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Added setquest for instance cooldown. [L0ne_W0lf]
//= 1.2 Fixed Torch#12 not being disabled. (bugreport:4044) [L0ne_w0lf]
+//= 1.3 Fixed cutins not being removed. (bugreport:4117) [L0ne_w0lf]
//============================================================
// Sealed Catacomb Entrance
@@ -69,7 +70,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Train more and use your skills to prevent the world from evil's looming presence...";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
case 2:
cutin "ins_cata_pri_n",2;
@@ -79,7 +80,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Train more and use your skills to prevent the world from evil's looming presence...";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
case 2:
@@ -100,7 +101,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "It seems you have entered this grave recently... You cannot enter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
@@ -113,7 +114,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "Name of the leader is "+.@partymembername$[0]+"...";
mes "Umm... But it seems that there is an unknown problem here... I'll check quickly. Please wait.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
}
else {
@@ -184,7 +185,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "For example, the skills like^0000FFSafety wall, Assumptio^000000... So you'd better to prepare enoughly before enter the grave.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
}
end;
}
@@ -195,7 +196,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Once the party leader is permitted, the rest of the party can enter. This is a rule of this monastery, so please understand.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
}
@@ -203,7 +204,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "It seems you have entered this grave recently... You cannot enter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
else if (.@ins_bapho_check == 2) {
@@ -219,7 +220,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
}
@@ -230,7 +231,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Please train more and come again.";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
}
end;
case 3:
@@ -251,7 +252,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "Go to see ^0000FFRust Blackhand^000000 who is near the main building of the monastery... Then he will make this doll helpful to you.";
setquest 3042;
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
case 4:
@@ -261,7 +262,7 @@ monk_test,309,146,3 script Friar Patrick#edq 412,{
mes "[Friar Patrick]";
mes "Train more and use your skills to prevent the world from evil's looming presence...";
close2;
- cutin "ins_cata_pri_n",255;
+ cutin "",255;
end;
}
}
@@ -1047,7 +1048,7 @@ OnTouch:
next;
mes "[Soul of Ancient Hero]";
mes "Go ahead, warriors.";
- cutin "ins_cata_champ_n",255;
+ cutin "",255;
instance_announce 0, "Soul of Ancient Hero : Now you can go to the Main Altar's gate. It is located in the Southeast",bc_map,"0xFFFF00";
close;
}
@@ -1058,21 +1059,21 @@ OnTouch:
next;
mes "[Soul of Ancient Hero]";
mes "I'll complete opening the sealed gate when your representative tell me that you're ready.";
- cutin "ins_cata_champ_n",255;
+ cutin "",255;
close;
}
else if ('ins_baphomet == 5) {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
mes "What are you doing? The entrance of the mail altar is opened right now, go and fight! Entrance is near the bottom of rightside of this floor.";
- cutin "ins_cata_champ_n",255;
+ cutin "",255;
close;
}
else {
cutin "ins_cata_champ_n",2;
mes "[Soul of Ancient Hero]";
mes "I have nothing to talk to you...";
- cutin "ins_cata_champ_n",255;
+ cutin "",255;
close;
}
}
@@ -2172,14 +2173,14 @@ OnTouch:
next;
mes "[Soul of Ancient Hero]";
mes "If you leave, please say hello to Patrick for me.";
- cutin "ins_cata_champ_n",255;
+ cutin "",255;
set 'ins_baphomet,0;
warp "monk_test",310,150;
close;
case 2:
mes "[Soul of Ancient Hero]";
mes "Do you still have something to do here? If you're done I'll let you leave here safely...";
- cutin "ins_cata_champ_n",255;
+ cutin "",255;
close;
}
}
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 88493c523..0b430853a 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN (Trunk, r12752+)
//===== Description: =========================================
@@ -16,6 +16,7 @@
//= 1.0 First version. Please report bugs. [L0ne_W0lf]
//= 1.1 Corrected a minor typo. [L0ne_W0lf]
//= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.3 Ei'felle now gives Exercise. (Bugreport:4092) [L0ne_W0lf]
//============================================================
//============================================================
@@ -11156,7 +11157,7 @@ ein_in01,85,208,5 script Ei felle#repay01 854,{
callsub S_BonusReward,1500,1235;
end;
case 11:
- callsub S_BonusReward,1500,1223;
+ callsub S_BonusReward,1500,1233;
end;
case 12:
callsub S_BonusReward,1500,1232;
diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt
index afa6ec819..10f6ac8a2 100644
--- a/npc/other/msg_boards.txt
+++ b/npc/other/msg_boards.txt
@@ -4,7 +4,7 @@
//= kobra_k88
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= [Aegis Conversion]
//= eAthena 7.15 +
@@ -23,6 +23,7 @@
//= 1.4 Rescripted to Aegis 10.3 standard. [L0ne_W0lf]
//= 1.5 Removed a duplicate related to the Sign Quest. [SinSloth]
//= 1.5 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.6 COmmented out conflicting npcs. (bugreport:4093) [L0ne_W0lf]
//============================================================
// Prontera
@@ -59,13 +60,13 @@ prontera,278,212,1 script Sign#Prt3 111,{
mes "Please help keep Prontera a clean place.";
close;
}
-
+/*
prontera,150,326,1 script Sign#Prt4 111,{
mes "^993300- The Sign Reads -^000000";
mes "Citizens of Prontera are Welcomed in the Prontera Castle.";
close;
}
-
+*/
prontera,31,212,1 script Billboard#Prt5 111,{
mes "^993300- The Billboard Reads -^000000";
mes "~WANTED~";
@@ -152,14 +153,13 @@ geffen,116,58,1 script Geffen Bulletin#Gef1 111,{
mes "Remember Wizard's...It's not how many skills you know, it's the magic that counts!";
close;
}
-
+/*
geffen,61,174,1 script Sign#Gef2 111,{
-OnClick:
mes "^993300- The Sign Reads -^000000";
mes "- Seems to be written in a language unfamiliar to you -";
close;
}
-
+*/
geffen,113,104,1 script Billboard#Gef3 111,{
mes "^993300- The Billboard Reads -^000000";
mes "Selling: Brand new Chon Chon Doll!";
diff --git a/npc/quests/2007_relay.txt b/npc/quests/2007_relay.txt
index d0c3de548..a9d969e85 100644
--- a/npc/quests/2007_relay.txt
+++ b/npc/quests/2007_relay.txt
@@ -11,6 +11,7 @@
//= Party Relay Quest.
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Fixed a couple typos, npcs check area for PCs. [L0ne_W0lf]
//============================================================
payon,103,113,3 script Ledrion#payon::RelayLedrion 109,{
@@ -2074,7 +2075,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
mes "Don't forget now, alright?";
close;
}
- if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((Baseclass == Job_Thief) || (BaseClass == Jog_Acolyte))) {
+ if ((countitem(7739) > 0) && (.@relaytime >= 11) && (.@relaytime < 14) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
mes "[Bafhail]";
mes "Oh, isn't that ticket...?";
mes "Ah, good, good. Judging";
@@ -2101,7 +2102,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
mes "I'll see you later~";
close;
}
- else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((Baseclass == Job_Thief) || (BaseClass == Jog_Acolyte))) {
+ else if ((countitem(7739) > 0) && (.@relaytime >= 0) && (.@relaytime < 3) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
mes "[Bafhail]";
mes "Oh, isn't that ticket...?";
mes "Ah, good, good. Judging";
@@ -2129,7 +2130,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
mes "I'll see you later~";
close;
}
- if ((countitem(7739) > 0) && ((Baseclass == Job_Thief) || (BaseClass == Jog_Acolyte))) {
+ if ((countitem(7739) > 0) && ((Baseclass == Job_Thief) || (BaseClass == Job_Acolyte))) {
mes "[Bafhail]";
mes "Oh, isn't that ticket...?";
mes "Ah, good, good. Judging";
@@ -2374,7 +2375,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
mes "I just described, okay?";
close;
}
- if ((countitem(7735) > 0) && (.@relaytime >= 14) && (.@relaytime < 17) && (BaseClass == Jog_Acolyte)) {
+ if ((countitem(7735) > 0) && (.@relaytime >= 14) && (.@relaytime < 17) && (BaseClass == Job_Acolyte)) {
mes "[Bafhail]";
mes "Oh, isn't that ticket...?";
mes "Ah, good, good. Judging";
@@ -2406,7 +2407,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
mes "I'll see you later~";
close;
}
- else if ((countitem(7735) > 0) && (.@relaytime >= 18) && (.@relaytime < 21) && (BaseClass == Jog_Acolyte)) {
+ else if ((countitem(7735) > 0) && (.@relaytime >= 18) && (.@relaytime < 21) && (BaseClass == Job_Acolyte)) {
mes "[Bafhail]";
mes "Oh, isn't that ticket...?";
mes "Ah, good, good. Judging";
@@ -2438,7 +2439,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 731,{
mes "I'll see you later~";
close;
}
- if ((countitem(7735) > 0) && (BaseClass == Jog_Acolyte)) {
+ if ((countitem(7735) > 0) && (BaseClass == Job_Acolyte)) {
mes "[Bafhail]";
mes "Oh, isn't that ticket...?";
mes "Ah, good, good. Judging";
@@ -2752,7 +2753,8 @@ payon,168,314,3 script Lospii#payon::RelayLospii 706,{
close;
}
set .@relaytime,gettime(3);
- //set .@juwi,getusersinrange(7);
+ getmapxy(.@m$,.@x,.@y,1,strnpcinfo(3));
+ set .@juwi,getareausers(.@m$,.@x-8,.@y-8,.@x+8,.@y+8);
if (party_relay == 32) {
mes "[Lospii]";
mes "Hey! Did you give";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 2b62ca76a..648451e7f 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 3.3
+//= 3.3a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -59,6 +59,7 @@
//= 3.2 Added missing updates for Peace to the Arunafeltz quest. [L0ne_W0lf]
//= 3.3 Fixed occurance of PcName. [L0ne_W0lf]
//= Fixed level 4 ID warps always being usable.
+//= 3.3a Fixed level 4 ID warps again. (Bugreport:4102) [L0ne_W0lf]
//============================================================
// Lost Child Quest (Prerequisite to High Priest quest)
@@ -3840,7 +3841,7 @@ OnTouch:
end;
OnInit:
- hideonnpc "#ice_4f_1";
+ disablenpc "#ice_4f_1";
end;
OnEnable:
@@ -3855,7 +3856,7 @@ OnTouch:
end;
OnInit:
- hideonnpc "#ice_4f_2";
+ disablenpc "#ice_4f_2";
end;
OnEnable:
@@ -3870,7 +3871,7 @@ OnTouch:
end;
OnInit:
- hideonnpc "#ice_4f_3";
+ disablenpc "#ice_4f_3";
end;
OnEnable:
@@ -3885,7 +3886,7 @@ OnTouch:
end;
OnInit:
- hideonnpc "#ice_4f_4";
+ disablenpc "#ice_4f_4";
end;
OnEnable:
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 2a63c2061..5309292c7 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -39,6 +39,7 @@
//= 1.5a Corrected a couple typos in Nameless Addition. [L0ne_W0lf]
//= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
//= 1.7 Moved a couple NPCs related to the Spy quest. [L0ne_W0lf]
+//= 1.8 Fixed some typos and confusing condition checks. [L0ne_W0lf]
//============================================================
// Stone Quest
@@ -194,7 +195,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{
mes "by the Tavern. A-auuugh!";
close;
}
- else if (veins_stone < 4) {
+ else if ((veins_stone > 1) && (veins_stone < 4)) {
mes "[Zabaroo]";
mes "Geez, Absar sure can";
mes "be fussy. Still, do your";
@@ -260,7 +261,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{
else if (veins_stone < 7) {
mes "[Zabaroo]";
mes "Thanks again for your help!";
- mes "What did Asbar call this";
+ mes "What did Absar call this";
mes "thing again? A Tactile...";
mes "Extendable... Damn it...";
mes "Why's the name so long?";
@@ -289,7 +290,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{
}
else if (veins_stone > 7) {
mes "[Zabaroo]";
- mes "Thanks to you and Asbar,";
+ mes "Thanks to you and Absar,";
mes "my poor back hasn't been";
mes "bothering me at all lately.";
mes "I should be taking better";
@@ -2910,7 +2911,7 @@ veins,327,185,3 script Kid#camelcamel 944,{
mes "if I want to free Curdie.";
close;
}
- else if (rachel_camel <= 16) {
+ else if ((rachel_camel >= 12) && (rachel_camel <= 16)) {
mes "["+strcharinfo(0)+"]";
mes "Well... I found the";
mes "camel. Now I need to get";
@@ -6560,11 +6561,13 @@ OnTouch:
end;
}
else if (aru_vol == 14) {
+ enablenpc "Colonel Vito#1";
mes "[Colonel Vito]";
mes "What are you still";
mes "doing standing there?";
mes "Don't slack off! Come!";
close2;
+ disablenpc "Colonel Vito#1";
warp "thor_camp",156,68;
end;
}
@@ -6574,7 +6577,6 @@ OnTouch:
thor_camp,162,182,0 script #Colonel2 -1,7,7,{
OnTouch:
//OnTouch2:
-
if (aru_vol == 13) {
enablenpc "Colonel Vito#2";
mes "[????]";
@@ -6614,6 +6616,7 @@ OnTouch:
end;
}
else if (aru_vol == 14) {
+ enablenpc "Colonel Vito#1";
mes "[Colonel Vito]";
mes "What are you still";
mes "doing standing there?";
@@ -6627,12 +6630,16 @@ OnTouch:
}
thor_camp,187,228,5 script Colonel Vito#1 946,{
+ end;
+
OnInit:
disablenpc "Colonel Vito#1";
end;
}
thor_camp,155,175,7 script Colonel Vito#2 946,{
+ end;
+
OnInit:
disablenpc "Colonel Vito#2";
end;