summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt12
-rw-r--r--npc/events/gdevent_aru.txt18
-rw-r--r--npc/events/gdevent_sch.txt18
-rw-r--r--npc/instances/EndlessTower.txt10
-rw-r--r--npc/merchants/icecream.txt9
-rw-r--r--npc/merchants/socket_enchant.txt21
-rw-r--r--npc/merchants/socket_enchant2.txt12
-rw-r--r--npc/other/auction.txt13
-rw-r--r--npc/other/mail.txt13
-rw-r--r--npc/other/mercenary_rent.txt8
-rw-r--r--npc/other/pvp.txt28
-rw-r--r--npc/quests/newgears/2006_headgear.txt6
-rw-r--r--npc/quests/quests_13_1.txt131
-rw-r--r--npc/quests/quests_lighthalzen.txt163
-rw-r--r--npc/quests/quests_moscovia.txt5
-rw-r--r--npc/quests/quests_veins.txt10
16 files changed, 277 insertions, 200 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 458bbc4f5..b0b1e3f3f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,17 @@
Date Added
======
+2011/02/06
+ * Rev. 14697 Script bug fixing. :] Here's some. I know it's been awhile. [L0ne_W0lf]
+ - Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)
+ - Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
+ - Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
+ - Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
+ - Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
+ It's worth noting how much I hate the system for restricting skills per zone.
+ - Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
+ - Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
+ - Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
+ - Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)
2011/01/16
* Rev. 14676 Various fixes for scripts that are disabled by default. [Ai4rei]
- Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index e18495620..1c6c70d95 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1,10 +1,26 @@
+//===== eAthena Script =======================================
+//= Guild dungeon event, Arunafeltz.
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= Guild dungeon event, Arunafeltz. Retrieve Morestone's
+//= pickaxe from Kublin.
+//===== Additional Comments: =================================
+//= 1.0 First version
+//= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//============================================================
+
arug_dun01,1,1,1 script Monster Controler#aru_gd 81,{
OnInit:
donpcevent "Monster Controler1#aru::OnKill";
initnpctimer;
end;
-OnTimer10000:
+OnTimer3600000:
donpcevent "Monster Controler1#aru::OnEnable";
mapannounce "arug_dun01", "Kublin: Aargh!",bc_map,"0x99CC00";
mapannounce "arug_dun01", "Morestone: Stop righ there! You thief!",bc_map,"0x99CC00";
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index 011d0acd7..9f2064afd 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1,10 +1,26 @@
+//===== eAthena Script =======================================
+//= Guild dungeon event, Schwaltzvalt.
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's
+//= pickaxe from Kublin.
+//===== Additional Comments: =================================
+//= 1.0 First version
+//= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf]
+//============================================================
+
schg_dun01,1,1,1 script Monster Controler#sch_gd 81,{
OnInit:
donpcevent "Monster Controler1#sch::OnKill";
initnpctimer;
end;
-OnTimer10000:
+OnTimer3600000:
donpcevent "Monster Controler1#sch::OnEnable";
mapannounce "schg_dun01", "Kublin: Aargh!",bc_map,"0x99CC00";
mapannounce "schg_dun01", "Morestone: Stop righ there! You thief!",bc_map,"0x99CC00";
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index b1dc002b9..495b367d2 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,8 @@
//= You may need to update your questid2display.
//= Changed White lady spawn to MVP White Lady. (bugreport:4601)
//= 1.5 Corrected some grammar and typos.
+//= 1.6 Corrected the tower re-entry blocked condition. (bugreport:4677) [L0ne_W0lf]
+//= Corrected floor 75 warp disabling the wrong NPC. (bugreport:4711)
//============================================================
alberta,214,77,6 script Captain Janssen 709,{
@@ -352,7 +354,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
}
close;
}
- else if ((.@etower_timer >= 0) && (.@etower_timer2 == 2)) {
+ else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) {
mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon.";
next;
mes "It is dangerous here. Let me move you to Alberta.";
@@ -2807,11 +2809,11 @@ OnTimer120000:
3@tower,355,51,0 script 75FGate102tower-2 45,2,2,{
OnInstanceInit:
- disablenpc instance_npcname("75FGate102tower", instance_id());
+ disablenpc instance_npcname("75FGate102tower-2", instance_id());
end;
OnEnable:
- enablenpc instance_npcname("75FGate102tower", instance_id());
+ enablenpc instance_npcname("75FGate102tower-2", instance_id());
end;
OnTouch_:
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index eb1dd0c63..ddc5fce03 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= KOOK SWU, Kisuka
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -12,10 +12,10 @@
//= 1.1 Optimized, changed overlapping coords in Alberta [Lupus]
//= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus]
//= 1.3 No more label menu and updated to match AEGIS script. [Kisuka]
+//= 1.4 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-// Alberta
-alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{
+- script Ice Cream Maker::IceCreamer -1,{
mes "[Ice Cream Maker]";
mes "Fresh Ice Cream made with snow from Lutie!";
mes "Enjoy it now, it won't be on sale for long!";
@@ -75,6 +75,9 @@ alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{
close;
}
+// Alberta
+alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 85
+
// Morroc Field
moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt
index 8f8a13b0d..9e9af6d68 100644
--- a/npc/merchants/socket_enchant.txt
+++ b/npc/merchants/socket_enchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= eAthena dev team
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -26,9 +26,10 @@
//= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka]
//= 1.9 Moved Episode 12 items to separate NPC.
//= Some cleanup & optimization. [Gepard]
+//= 2.0 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-payon,140,151,5 script Seiyablem#pay 84,{
+- script Seiyablem#dummy::SocketEnchant -1,{
if (checkweight(1201,1) == 0)
{
mes "- Wait a minute !! -";
@@ -333,11 +334,12 @@ function script Func_Socket {
}
}
-lhz_in02,281,35,5 duplicate(Seiyablem#pay) Seiyablem#lhz 84
-prt_in,33,70,5 duplicate(Seiyablem#pay) Seiyablem#prt 84
-morocc,51,41,4 duplicate(Seiyablem#pay) Seiyablem#moc 84
+payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 84
+lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 84
+prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 84
+morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84
-prt_in,31,57,1 script Young Man#prt 97,{
+- script Young Man#dummy::SocketMan -1,{
mes "[Young Man]";
mes "I'm considering becoming a Slotting Engineer.";
mes "It's a new field where you can add Slots to equipment, and it'd be cool if I can work in such a lucrative career.";
@@ -354,6 +356,7 @@ prt_in,31,57,1 script Young Man#prt 97,{
close;
}
-payon,143,143,7 duplicate(Young Man#prt) Young Man#pay 97
-morocc,60,42,3 duplicate(Young Man#prt) Young Man#moc 97
-lhz_in02,269,33,5 duplicate(Young Man#prt) Young Man#lhz 97
+prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 97
+payon,143,143,7 duplicate(SocketMan) Young Man#pay 97
+morocc,60,42,3 duplicate(SocketMan) Young Man#moc 97
+lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 97
diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt
index 58b934b24..e7f14c37c 100644
--- a/npc/merchants/socket_enchant2.txt
+++ b/npc/merchants/socket_enchant2.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Gepard
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -11,9 +11,10 @@
//= Adds slots to selected weapons and armor.
//===== Additional Comments: =================================
//= 1.0 First version.
+//= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-payon,236,199,3 script Leablem 86,{
+- script Leablem#dummy::SocketEnchant2 -1,{
if (checkweight(1201,1) == 0)
{
mes "- Wait a seconds !! -";
@@ -377,9 +378,10 @@ payon,236,199,3 script Leablem 86,{
}
}
-lighthalzen,96,137,3 duplicate(Leablem) Leablem#lhz 86
-prontera,244,169,5 duplicate(Leablem) Leablem#prt 86
-moc_ruins,154,86,3 duplicate(Leablem) Leablem#moc 86
+payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86,{
+lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86
+prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86
+moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86
function script Func_Socket2 {
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index 4a033fa3a..20fcde573 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.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, place holders only. [L0ne_W0lf]
//= 1.1 Moved Morroc Auction NPCs to Morroc Ruins. [L0ne_W0lf]
//= 1.2 Warp fixed. Dialog in Ruins/Lighthalzen changed. [Kisuka]
+//= 1.3 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
// Auction House warpers
@@ -72,14 +73,15 @@ function script F_AuctionWarper {
// Sign posts
//============================================================
-moc_ruins,76,176,6 script Information Post#moc::AuctionSign 837,{
+- script Information Post#dum::AuctionSign -1,{
mes "[Information]";
mes "Auction Warp Guide";
close;
}
-prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 837,{
-yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 837,{
+moc_ruins,76,176,6 duplicate(AuctionSign) Information Post#moc 837
+prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 837
+yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 837
lighthalzen,207,169,6 duplicate(AuctionSign) Information Post#lhz 837
// Warps
@@ -91,7 +93,7 @@ auction_02,43,17,0 warp auction_enterance_lhz 1,1,lighthalzen,209,169
// Auction House NPCs
//============================================================
-auction_01,182,68,6 script Auction Broker#moc1::AuctionBroker 98,{
+- script Auction Broker#dum::AuctionBroker -1,{
mes "[Auction Broker]";
mes "Welcome to the Auction Hall.";
mes "Would you like to view the goods?";
@@ -114,6 +116,7 @@ auction_01,182,68,6 script Auction Broker#moc1::AuctionBroker 98,{
close;
}
+auction_01,182,68,6 duplicate(AuctionBroker) Auction Broker#moc1 98
auction_01,182,75,0 duplicate(AuctionBroker) Auction Broker#moc2 99
auction_01,177,75,2 duplicate(AuctionBroker) Auction Broker#moc3 98
auction_01,177,68,4 duplicate(AuctionBroker) Auction Broker#moc4 99
diff --git a/npc/other/mail.txt b/npc/other/mail.txt
index 626efcb0b..778dba4f4 100644
--- a/npc/other/mail.txt
+++ b/npc/other/mail.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -17,14 +17,12 @@
//= 1.3a Corrected a typo error. (bugreport:798) [Samuray22]
//= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus]
//= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf]
+//= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-// Allow Mail Inbox reading from
+// Floating mailbox npc that all NPCs duplicate from.
//============================================================
-
-// Prontera
-//============================================================
-prontera,146,86,0 script Mailbox#prt::MailBox 888,{
+- script Mailbox#dummy::MailBox -1,{
mes "[Mailbox]";
mes "If you'd like to use";
mes "the Mailbox Service,";
@@ -57,6 +55,9 @@ prontera,146,86,0 script Mailbox#prt::MailBox 888,{
close;
}
+// Prontera
+//============================================================
+prontera,146,86,0 duplicate(MailBox) Mailbox#prt 888
prontera,275,213,0 duplicate(MailBox) Mailbox#2prt 888
prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 888
diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt
index 645f7dfd6..23c3e78c1 100644
--- a/npc/other/mercenary_rent.txt
+++ b/npc/other/mercenary_rent.txt
@@ -1,9 +1,10 @@
//===== eAthena Script =======================================
+//===== eAthena Script =======================================
//= Mercenary related NPCs
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,6 +15,7 @@
//= 1.0 First version. [L0ne_W0lf]
//= 1.1 Optimization. [Zephyrus]
//= 1.2 Removed redundent input. [L0ne_W0lf]
+//= 1.3 Duplicates now spawned from floating NPCs. [L0ne_W0lf]
//============================================================
prontera,41,337,5 script Mercenary Manager#Spear 105,{
@@ -653,7 +655,7 @@ pay_arche,99,167,4 script Mercenary Manager#Bow 732,{
// Mercenary Merchant NPCs
//============================================================
-prontera,30,337,4 script Mercenary Merchant#Spear::MercMerchant 700,{
+- script Mercenary Merchant#dummy::MercMerchant -1,{
mes "[Mercenary Goods Merchant]";
mes "Hello, I sell goods";
mes "that Mercenaries can";
@@ -698,8 +700,10 @@ prontera,30,337,4 script Mercenary Merchant#Spear::MercMerchant 700,{
next;
callfunc "F_PurchaseMercItem",12243,2100;
}
+ close;
}
+prontera,30,337,4 duplicate(MercMerchant) Mercenary Merchant#Spear 700
izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892
pay_arche,102,167,5 duplicate(MercMerchant) Mercenary Merchant#Bow 879
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 05c56e2e5..5a7673ce9 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -26,15 +26,12 @@
//= exception of the "Free for all" mode.
//= Added PVP event NPCs.
//= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
+//= 1.5 Duplicates now spawn from floating NPCs. [L0ne_W0lf]
//============================================================
-// Morroc
+// Floating NPC
//============================================================
-morocc_in,144,138,4 script PVPNarrator#moc 84,{
- callfunc "F_PVPNarrator","morocc_in",141,139;
-}
-
-morocc_in,144,142,4 script Gate Keeper#moc::PVPGateKeeper 83,{
+- script Gate Keeper#dummy::PVPGateKeeper -1,{
mes "[Gate Keeper]";
mes "Glad to be of service.";
mes "I will open the PVP fight";
@@ -114,6 +111,15 @@ morocc_in,144,142,4 script Gate Keeper#moc::PVPGateKeeper 83,{
}
}
+// Morroc
+//============================================================
+morocc_in,144,138,4 script PVPNarrator#moc 84,{
+ callfunc "F_PVPNarrator","morocc_in",141,139;
+}
+
+morocc_in,144,142,4 duplicate(PVPGateKeeper) Gate Keeper#moc 83,{
+
+
// Alberta
//============================================================
alberta_in,22,146,4 script PVP Narrator#alb 84,{
@@ -465,7 +471,7 @@ OnInit:
// Spectator Entrance
//============================================================
-pvp_room,62,85,4 script Spectator's Entrance#1::PVPSpectator 105,{
+- script Spectator's Entrance#dum::PVPSpectator -1,{
if (countitem(7029) == 0) {
mes "[PVP Compete Square Register Staff]";
mes "This is the entrance for viewers.";
@@ -492,6 +498,8 @@ OnInit:
end;
}
+pvp_room,62,85,4 duplicate(PVPSpectator) Spectator's Entrance#1 105
+
pvp_room,70,85,4 duplicate(PVPSpectator) Spectator's Entrance#2 105
pvp_room,78,85,4 duplicate(PVPSpectator) Spectator's Entrance#3 105
@@ -500,7 +508,7 @@ pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 105
// Spectator Warps
//============================================================
-pvp_2vs2,5,4,0 script Combat Square Staff#1::PVPSpecWarp 45,1,1,{
+- script Combat Square Staff#dum::PVPSpecWarp -1,{
OnTouch:
mes "[Combat Square Staff]";
mes "May I help you?";
@@ -512,6 +520,8 @@ OnTouch:
end;
}
+pvp_2vs2,5,4,0 duplicate(PVPSpecWarp) Combat Square Staff#1 45,1,1,{
+
pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff#2 45,1,1
pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff#3 45,1,1
diff --git a/npc/quests/newgears/2006_headgear.txt b/npc/quests/newgears/2006_headgear.txt
index e8980b0be..25d69475d 100644
--- a/npc/quests/newgears/2006_headgear.txt
+++ b/npc/quests/newgears/2006_headgear.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= DiviniaRO members, cleaned by reddozen
//===== Current Version: =====================================
-//= 1.3a
+//= 1.4
//===== Compatible With: =====================================
//= SVN eA
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= Fixed some of the names to iRO.
//= 1.3 Fixed some color code bugs in Ghenirhemin. Thanks to yyCC. [L0ne_W0lf]
//= 1.3a Fixed wrong item names (due to copy/paste) [Lupus]
+//= 1.4 Chungwolmang now checks if the last item set should be deleted. (bugreport:4719) [L0ne_W0lf]
//============================================================
//===================== Censor Bar =====================================================
@@ -781,7 +782,8 @@ S_MakeMask:
delitem getarg(1),getarg(2);
delitem getarg(3),getarg(4);
delitem getarg(5),getarg(6);
- delitem getarg(7),getarg(8);
+ if (getarg(0) == 5169)
+ delitem getarg(7),getarg(8);
getitem getarg(0),1;
set moza_tal,0;
mes "[Chungwolmang]";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index e1b885d5d..a85c3173d 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -33,6 +33,7 @@
//= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131)
//= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276)
//= 1.6 Fixed check in cat hand agent.
+//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf]
//============================================================
// Onward to the New World
@@ -8956,8 +8957,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
break;
}
@@ -8972,8 +8973,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 5500) {
set zeny,zeny-5500;
@@ -8982,8 +8983,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
break;
}
@@ -8998,8 +8999,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 5025) {
set zeny,zeny-5025;
@@ -9008,8 +9009,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 5025) {
set zeny,zeny-5025;
@@ -9018,8 +9019,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
break;
}
@@ -9034,8 +9035,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 5025) {
set zeny,zeny-5025;
@@ -9044,8 +9045,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 5025) {
set zeny,zeny-5025;
@@ -9054,8 +9055,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 5025) {
set zeny,zeny-5025;
@@ -9064,8 +9065,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
break;
}
@@ -9080,8 +9081,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9090,8 +9091,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9100,8 +9101,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9110,8 +9111,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9120,8 +9121,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
break;
}
@@ -9136,8 +9137,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9146,8 +9147,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9156,8 +9157,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9166,8 +9167,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9176,8 +9177,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
if (Zeny >= 4765) {
set zeny,zeny-4765;
@@ -9186,8 +9187,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 7:
break;
}
@@ -9202,8 +9203,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9212,8 +9213,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9222,8 +9223,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9232,8 +9233,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9242,8 +9243,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9252,8 +9253,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 7:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9262,8 +9263,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 8:
break;
}
@@ -9338,8 +9339,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9348,8 +9349,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9358,8 +9359,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9368,8 +9369,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9378,8 +9379,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9388,8 +9389,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 7:
if (Zeny >= 4590) {
set zeny,zeny-4590;
@@ -9398,8 +9399,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 8:
break;
}
@@ -9414,8 +9415,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9424,8 +9425,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9434,8 +9435,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9444,8 +9445,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9454,8 +9455,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9464,8 +9465,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 7:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9474,8 +9475,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 8:
if (Zeny >= 4170) {
set zeny,zeny-4170;
@@ -9484,8 +9485,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 9:
break;
}
@@ -9500,8 +9501,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9510,8 +9511,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9520,8 +9521,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9530,8 +9531,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9540,8 +9541,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9550,8 +9551,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 7:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9560,8 +9561,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 8:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9570,8 +9571,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 9:
if (Zeny >= 4025) {
set zeny,zeny-4025;
@@ -9580,8 +9581,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 10:
break;
}
@@ -9596,8 +9597,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9606,8 +9607,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9616,8 +9617,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 4:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9626,8 +9627,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 5:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9636,8 +9637,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 6:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9646,8 +9647,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 7:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9656,8 +9657,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 8:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9666,8 +9667,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 9:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9676,8 +9677,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 10:
if (Zeny >= 3970) {
set zeny,zeny-3970;
@@ -9686,8 +9687,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 11:
break;
}
@@ -9708,8 +9709,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 2:
if (Zeny >= 5500) {
set zeny,zeny-5500;
@@ -9718,8 +9719,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{
else {
mes "[Cat Hand Agent]";
mes "Don't play with money.";
- close;
}
+ close;
case 3:
mes "[Cat Hand Agent]";
mes "Thank you for using our service.";
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 27d9aa452..1917386cf 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4,7 +4,7 @@
//= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
//= Lupus, Lord Gywall
//===== Current Version: =====================================
-//= 4.6
+//= 4.7
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -76,6 +76,7 @@
//= 4.5 Official Gangster Alert script. [Gepard]
//= 4.6 Added quest log entries for:
//= - Cursed Spirit Quest
+//= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf]
//============================================================
// Gangster Alert [Aegis Conversion]
@@ -5235,89 +5236,93 @@ lhz_in01,114,181,3 script Representative 71,{
mes "to the Rekenber Corporation.";
mes "How may I be of service today?";
next;
- if(lhz_curse == 7) menu "Building Information",L_Building,"Corporation History",L_History;
- else menu "Building Information",L_Building;
-
- while(1) {
- mes "[Representative]";
- mes "Please tell me";
- mes "which floor you'd like";
- mes "to know more about.";
- next;
- switch( select( "1F","2F","B1","Cancel" ) )
- {
- case 1:
- mes "[Representative]";
- mes "The ^3131FFRekenber Library^000000 can";
- mes "be found at the end of the";
- mes "left hallway. Our library is";
- mes "a great resource of innovative";
- mes "ideas and information for our";
- mes "system development employees.";
- next;
- mes "[Representative]";
- mes "The ^3131FFBall Room^000000, where";
- mes "various official events are";
- mes "usually held, can be accessed";
- mes "through the right hallway.";
- next;
- break;
+ if(lhz_curse == 7)
+ select("Building Information","Corporation History");
+ else
+ select("Building Information");
+
+ if (@menu == 1) {
+ while(1) {
+ mes "[Representative]";
+ mes "Please tell me";
+ mes "which floor you'd like";
+ mes "to know more about.";
+ next;
+ switch( select( "1F","2F","B1","Cancel" ) )
+ {
+ case 1:
+ mes "[Representative]";
+ mes "The ^3131FFRekenber Library^000000 can";
+ mes "be found at the end of the";
+ mes "left hallway. Our library is";
+ mes "a great resource of innovative";
+ mes "ideas and information for our";
+ mes "system development employees.";
+ next;
+ mes "[Representative]";
+ mes "The ^3131FFBall Room^000000, where";
+ mes "various official events are";
+ mes "usually held, can be accessed";
+ mes "through the right hallway.";
+ next;
+ break;
- case 2:
- mes "[Representative]";
- mes "Please use the stairs";
- mes "located on both sides of";
- mes "the Help Desk to go to the";
- mes "Second Floor. The Second";
- mes "Floor is mostly used for";
- mes "administrative purposes.";
- next;
- mes "[Representative]";
- mes "There, you can find";
- mes "the ^3131FFConference Room^000000,";
- mes "^3131FFSecretary Office^000000, the";
- mes "^3131FFAuditorium^000000 and the";
- mes "^3131FFChairman's Office^000000.";
- next;
- break;
+ case 2:
+ mes "[Representative]";
+ mes "Please use the stairs";
+ mes "located on both sides of";
+ mes "the Help Desk to go to the";
+ mes "Second Floor. The Second";
+ mes "Floor is mostly used for";
+ mes "administrative purposes.";
+ next;
+ mes "[Representative]";
+ mes "There, you can find";
+ mes "the ^3131FFConference Room^000000,";
+ mes "^3131FFSecretary Office^000000, the";
+ mes "^3131FFAuditorium^000000 and the";
+ mes "^3131FFChairman's Office^000000.";
+ next;
+ break;
- case 3:
- mes "[Representative]";
- mes "The first underground floor";
- mes "is used by the ^3131FFRegenshirm^000000,";
- mes "our laboratory affiliate. For";
- mes "security reasons, this floor";
- mes "is not accessible to visitors";
- next;
- break;
+ case 3:
+ mes "[Representative]";
+ mes "The first underground floor";
+ mes "is used by the ^3131FFRegenshirm^000000,";
+ mes "our laboratory affiliate. For";
+ mes "security reasons, this floor";
+ mes "is not accessible to visitors";
+ next;
+ break;
- case 4:
- mes "[Representative]";
- mes "We are always doing our";
- mes "best to provide the best";
- mes "services to our customers.";
- mes "Remember that Rekenber";
- mes "is the name you can trust.";
- mes "Thank you and have a nice day.";
- close;
+ case 4:
+ mes "[Representative]";
+ mes "We are always doing our";
+ mes "best to provide the best";
+ mes "services to our customers.";
+ mes "Remember that Rekenber";
+ mes "is the name you can trust.";
+ mes "Thank you and have a nice day.";
+ close;
+ }
}
}
-
-L_History:
- mes "[Representative]";
- mes "If you're interested in";
- mes "learning the history of";
- mes "our corporation, please";
- mes "speak to the representative";
- mes "inside our Library. Thank you.";
- next;
- mes "[Representative]";
- mes "Please head down";
- mes "the hallway to the left in";
- mes "order to find our Library.";
- mes "Thank you and have a nice day.";
- changequest 2087,2088;
- set lhz_curse,8;
+ else {
+ mes "[Representative]";
+ mes "If you're interested in";
+ mes "learning the history of";
+ mes "our corporation, please";
+ mes "speak to the representative";
+ mes "inside our Library. Thank you.";
+ next;
+ mes "[Representative]";
+ mes "Please head down";
+ mes "the hallway to the left in";
+ mes "order to find our Library.";
+ mes "Thank you and have a nice day.";
+ changequest 2087,2088;
+ set lhz_curse,8;
+ }
close;
}
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 8371f59bd..89f642316 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.8
+//= 1.9
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.6 Added 'tides' to Ibanoff & Fixed time check for Marozka. [Kisuka]
//= 1.7 Fixes on donpcevents and fixed some left over aegis stuff. [Kisuka]
//= 1.8 Fixed some condition checks. [Gepard]
+//= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf]
//============================================================
//============================================================================
@@ -5117,7 +5118,7 @@ OnDisable:
end;
OnMyMobDead:
- if (mobcount("mosk_ship","Baehideun1#ship::OnMyMobDead") < 1) {
+ if (mobcount("mosk_ship","Baehideun4#ship::OnMyMobDead") < 1) {
set $@mos1_edq,0;
mes "[Mr. Ibanoff]";
mes "Now that all the monsters are gone,";
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 8decb1264..a3647b34a 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -43,6 +43,7 @@
//= 1.9 Added quest log entries for:
//= - Siblings Quest
//= - Thor Volcano Base Quest
+//= 2.0 Removed lvel requirement. (bugreport:4678) [L0ne_W0lf]
//============================================================
// Stone Quest
@@ -56,7 +57,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{
mes "- you put some items into Kafra Storage. -";
close;
}
- if ((veins_stone == 0) && (BaseLevel > 59)) {
+ if (veins_stone == 0) {
mes "[Zabaroo]";
mes "My back is killing me";
mes "after stooping over to";
@@ -300,11 +301,6 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{
mes "care of myself at my age...";
close;
}
- mes "[Zabaroo]";
- mes "I'm sorry dear.";
- mes "You're not strong enough for this kind of work.";
- mes "Put on some muscle and talk to me again.";
- close;
}
ve_in,169,310,6 script Strange Old Man#ve 121,{
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 08:33:18 +0000