summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/item_db.txt6
-rw-r--r--db/quest_db.txt2
-rw-r--r--npc/guild/aldeg_cas03.txt14
-rw-r--r--npc/instances/OrcsMemory.txt13
-rw-r--r--npc/other/arena/arena_lvl50.txt15
-rw-r--r--npc/other/arena/arena_lvl60.txt2
-rw-r--r--npc/other/arena/arena_lvl70.txt15
-rw-r--r--npc/other/arena/arena_lvl80.txt15
-rw-r--r--npc/other/comodo_gambling.txt378
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt1
-rw-r--r--npc/quests/The_Sign_Quest.txt14
-rw-r--r--npc/quests/gunslinger_quests.txt4
-rw-r--r--npc/quests/quests_13_1.txt2
-rw-r--r--npc/quests/quests_amatsu.txt2
-rw-r--r--npc/quests/quests_moscovia.txt2
15 files changed, 198 insertions, 287 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index d1125a135..44c2ba935 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1450,8 +1450,8 @@
2426,Shadow_Walk,Shadow Walk,5,20,,2000,,0,,0,0xFFFFFFFE,2,2,64,,75,1,0,{ bonus bMdef,10; if(getskilllv("AS_CLOAKING") < 3){ bonus5 bAutoSpellWhenHit,"AS_CLOAKING",3,100,BF_MAGIC,0; } else bonus5 bAutoSpellWhenHit,"AS_CLOAKING",getskilllv("AS_CLOAKING"),100,BF_MAGIC,0; },{},{}
2427,Golden_Shoes,Golden Shoes,5,20,,300,,4,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMdef,4; },{},{}
//2428,Freyja_Boots,Freyja Boots,5,0,,300,,10,,0,0xFFFFFFFE,7,2,64,,0,0,0,{ bonus2 bSubRace,RC_DemiHuman,5; },{},{}
-2429,Iron_Boots01,Iron Boots,5,0,,1500,,5,,0,0x000E5CEA,7,2,64,,0,1,0,{},{},{}
-2430,Iron_Boots02,Iron Boots,5,0,,800,,5,,0,0xFFFFFFFF,7,2,64,,0,1,0,{},{},{}
+2429,Iron_Boots01,Iron Boots,5,0,,1500,,5,,0,0x03146350,7,2,64,,0,1,0,{},{},{}
+2430,Iron_Boots02,Iron Boots,5,0,,800,,5,,0,0x01418315,7,2,64,,0,1,0,{},{},{}
2431,Valley_Shoes,Valley Shoes,5,20,,0,,10,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMaxHPRate,7; bonus bMaxSPRate,7; },{},{}
2432,Spiky_Heel_,High Heels,5,8500,,600,,2,,1,0xFFFFFFFE,7,2,64,,0,1,0,{ bonus bMdef,5; },{},{}
2433,Diabolus_Boots,Diabolus Boots,5,20,,250,,4,,1,0x00CFFF80,2,2,64,,0,1,0,{ bonus bMaxHP,(BaseLevel*10); },{},{}
@@ -2796,7 +2796,7 @@
5222,Fish_On_Head_,Evolved Blue Fish,5,20,,500,,2,,0,0xFFFFFFFF,7,2,256,,50,1,149,{ bonus bAgi,1; bonus bDex,1; },{},{}
5223,Big_Golden_Bell_,Evolved Big Golden Bell,5,20,,200,,2,,0,0xFFFFFFFE,7,2,768,,35,1,175,{ bonus bAgi,2; },{},{}
5224,Orc_Hero_Helm_TW,Evolved Orc Hero Helm,5,500000,,900,,5,,0,0xFFFFFFFE,7,2,768,,55,1,178,{ bonus bStr,2; bonus bVit,1; bonus bMaxHPrate,10; },{},{}
-5225,Marcher_Hat,Parade Hat,5,20,,200,,2,,1,0xFFFFFFFF,7,2,256,,10,1,269,{ bonus bMdef,2; bonus bStr,2; bonus3 bAutoSpell,"AL_ANGELUS",5,30; },{},{}
+5225,Marcher_Hat,Parade Hat,5,20,,200,,2,,1,0xFFFFFFFF,7,2,256,,10,1,269,{ bonus2 bResEff,Eff_Stun,1000; bonus3 bAutoSpellWhenHit,"NV_FIRSTAID",1,100; bonus3 bAutoSpellWhenHit,"TF_BACKSLIDING",1,100; /*If(BaseClass == Job_Acolyte) { bonus4 bAutoSpellOnSkill,"PR_LEXAETERNA","AL_HEAL",1,10;*/ }},{},{}
5226,Mini_Propeller_,Mini Propeller,5,20,,200,,2,,0,0xFFFFFFFF,7,2,256,,0,1,270,{ bonus bAgi,2; bonus bDex,1; bonus bFlee,10; bonus bCastrate,-getrefine(); },{},{}
5227,Red_Deviruchi_Cap,Red Deviruchi Hat,5,20,,800,,2,,0,0xFFFFFFFE,7,2,256,,64,1,271,{ bonus bStr,1; bonus bInt,1; },{},{}
5228,White_Deviruchi_Cap,Gray Deviruchi Hat,5,20,,800,,2,,0,0xFFFFFFFE,7,2,256,,64,1,272,{ bonus bStr,1; bonus bInt,1; },{},{}
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 6932de5dd..64bb7f37c 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -1264,7 +1264,7 @@
12056,0,0,0,0,0,0,0,"Job Quest - Assassin"
12057,0,0,0,0,0,0,0,"Pass to the Lab"
12058,0,0,0,0,0,0,0,"Admission Restricted to the 102 Tower"
-12059,9600,0,0,0,0,0,0,"Orc's Memory Time Limit"
+12059,7200,0,0,0,0,0,0,"Orc's Memory Time Limit"
12060,86400,0,0,0,0,0,0,"Today's Fishing Closed"
12061,0,0,0,0,0,0,0,"Concentration"
12062,86400,0,0,0,0,0,0,"Today's Mining Closed"
diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt
index 2e2f3163d..eab5a4c5a 100644
--- a/npc/guild/aldeg_cas03.txt
+++ b/npc/guild/aldeg_cas03.txt
@@ -93,14 +93,12 @@ aldeg_cas03,69,71,2 duplicate(Nuenberg3) Nuenberg#a3-9 722
aldeg_cas03,91,69,2 duplicate(Nuenberg3) Nuenberg#a3-10 722
aldeg_cas03,108,60,2 duplicate(Nuenberg3) Nuenberg#a3-11 722
aldeg_cas03,121,73,2 duplicate(Nuenberg3) Nuenberg#a3-12 722
-aldeg_cas03,121,73,2 duplicate(Nuenberg3) Nuenberg#a3-13 722
-aldeg_cas03,75,102,2 duplicate(Nuenberg3) Nuenberg#a3-14 722
-aldeg_cas03,199,169,2 duplicate(Nuenberg3) Nuenberg#a3-15 722
-aldeg_cas03,181,179,2 duplicate(Nuenberg3) Nuenberg#a3-16 722
-aldeg_cas03,192,44,2 duplicate(Nuenberg3) Nuenberg#a3-17 722
-aldeg_cas03,208,145,2 duplicate(Nuenberg3) Nuenberg#a3-18 722
-aldeg_cas03,207,75,2 duplicate(Nuenberg3) Nuenberg#a3-19 722
-aldeg_cas03,96,62,2 duplicate(Nuenberg3) Nuenberg#a3-20 722
+aldeg_cas03,75,102,2 duplicate(Nuenberg3) Nuenberg#a3-13 722
+aldeg_cas03,199,169,2 duplicate(Nuenberg3) Nuenberg#a3-14 722
+aldeg_cas03,181,179,2 duplicate(Nuenberg3) Nuenberg#a3-15 722
+aldeg_cas03,192,44,2 duplicate(Nuenberg3) Nuenberg#a3-16 722
+aldeg_cas03,208,145,2 duplicate(Nuenberg3) Nuenberg#a3-17 722
+aldeg_cas03,96,62,2 duplicate(Nuenberg3) Nuenberg#a3-18 722
// AGIT Manager
//============================================================
diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt
index fa2ab47c0..ef5968a97 100644
--- a/npc/instances/OrcsMemory.txt
+++ b/npc/instances/OrcsMemory.txt
@@ -109,6 +109,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 406,{
donpcevent instance_npcname("#Boss Control", instance_id())+"::OnInstanceInit";
donpcevent instance_npcname("#Warp Outside Orc Dun", instance_id())+"::OnInstanceInit";
donpcevent instance_npcname("Kruger#", instance_id())+"::OnInstanceInit";
+ disablenpc instance_npcname("Kruger#2-2", instance_id());
close;
}
@@ -906,6 +907,7 @@ OnTimer23910:
}
2@orcs,26,164,0 script Torch#1-1 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#1-2", instance_id())+"::OnEnable";
initnpctimer;
@@ -931,6 +933,7 @@ OnTimer2000:
}
2@orcs,55,155,0 script Torch#1-2 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#1-3", instance_id())+"::OnEnable";
initnpctimer;
@@ -956,6 +959,7 @@ OnTimer2000:
}
2@orcs,108,146,0 script Torch#1-3 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#1-4", instance_id())+"::OnEnable";
initnpctimer;
@@ -981,6 +985,7 @@ OnTimer2000:
}
2@orcs,98,171,0 script Torch#1-4 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("#Warp2-1", instance_id())+"::OnEnable";
initnpctimer;
@@ -1031,6 +1036,7 @@ OnTouch:
}
2@orcs,35,92,0 script Torch#2-1 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#2-2", instance_id())+"::OnEnable";
initnpctimer;
@@ -1048,6 +1054,7 @@ OnTimer2000:
}
2@orcs,32,70,0 script Torch#2-2 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#2-3", instance_id())+"::OnEnable";
initnpctimer;
@@ -1073,6 +1080,7 @@ OnTimer2000:
}
2@orcs,70,31,0 script Torch#2-3 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#2-4", instance_id())+"::OnEnable";
initnpctimer;
@@ -1098,6 +1106,7 @@ OnTimer2000:
}
2@orcs,84,51,0 script Torch#2-4 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("#Warp2-2", instance_id())+"::OnEnable";
initnpctimer;
@@ -1148,6 +1157,7 @@ OnTouch:
}
2@orcs,142,145,0 script Torch#3-1 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#3-2", instance_id())+"::OnEnable";
initnpctimer;
@@ -1165,6 +1175,7 @@ OnTimer2000:
}
2@orcs,162,134,0 script Torch#3-2 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#3-3", instance_id())+"::OnEnable";
initnpctimer;
@@ -1190,6 +1201,7 @@ OnTimer2000:
}
2@orcs,144,117,0 script Torch#3-3 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("Torch#3-4", instance_id())+"::OnEnable";
initnpctimer;
@@ -1215,6 +1227,7 @@ OnTimer2000:
}
2@orcs,136,98,0 script Torch#3-4 844,{
+ if(getpartyleader(getcharid(1),2) != getcharid(0)) end;
progressbar "ffff00",5;
donpcevent instance_npcname("#Warp2-3", instance_id())+"::OnEnable";
initnpctimer;
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index 12df84255..817501a3a 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -17,12 +17,11 @@ arena_room,64,138,5 script lvl 50s Waiting Room 124,{
end;
OnInit:
- waitingroom "Individual ; lvl 50 or higher",50,"lvl 50s Waiting Room::OnStartArena",1;
+ waitingroom "Individual : lvl 50 or higher",50,"lvl 50s Waiting Room::OnStartArena",1,1000,50;
enablewaitingroomevent;
end;
OnStartArena:
- enablenpc "ArenaFee#50";
warpwaitingpc "force_1-1",99,12;
donpcevent "arena#50::Onstart";
disablewaitingroomevent;
@@ -33,18 +32,6 @@ Onstart:
end;
}
-force_1-1,99,12,1 script ArenaFee#50 139,1,1,{
-
-OnInit:
- disablenpc "ArenaFee#50";
- end;
-
-OnTouch:
- set Zeny,Zeny -1000;
- disablenpc "ArenaFee#50";
- end;
-}
-
force_1-1,99,20,4 script Heel and Toe#arena 124,{
end;
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index 72fc78819..9224898cd 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -17,7 +17,7 @@
arena_room,38,88,5 script lvl 60s Waiting Room 124,{
OnInit:
- waitingroom "Individual ; lvl 60 or higher",50,"lvl 60s Waiting Room::OnStartArena",1;
+ waitingroom "Individual : lvl 60 or higher",50,"lvl 60s Waiting Room::OnStartArena",1,1000,60;
enablewaitingroomevent;
end;
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index cc2e5cfd5..aa24b02a9 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -17,12 +17,11 @@ arena_room,52,42,7 script lvl 70s Waiting Room 124,{
end;
OnInit:
- waitingroom "Individual ; lvl 70 or higher",50,"lvl 70s Waiting Room::OnStartArena",1;
+ waitingroom "Individual : lvl 70 or higher",50,"lvl 70s Waiting Room::OnStartArena",1,1000,70;
enablewaitingroomevent;
end;
OnStartArena:
- enablenpc "ArenaFee#70";
warpwaitingpc "force_3-1",99,12;
donpcevent "arena#70::Onstart";
disablewaitingroomevent;
@@ -33,18 +32,6 @@ Onstart:
end;
}
-force_3-1,99,12,1 script ArenaFee#70 139,1,1,{
-
-OnInit:
- disablenpc "ArenaFee#70";
- end;
-
-OnTouch:
- set Zeny,Zeny -1000;
- disablenpc "ArenaFee#70";
- end;
-}
-
force_3-1,99,20,4 script Cadillac#arena 124,{
end;
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 501cb11c2..dbdecba73 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -17,12 +17,11 @@ arena_room,147,42,1 script lvl 80s Waiting Room 124,{
end;
OnInit:
- waitingroom "Individual ; lvl 80 or higher",50,"lvl 80s Waiting Room::OnStartArena",1;
+ waitingroom "Individual : lvl 80 or higher",50,"lvl 80s Waiting Room::OnStartArena",1,1000,80;
enablewaitingroomevent;
end;
OnStartArena:
- enablenpc "ArenaFee#80";
warpwaitingpc "force_4-1",99,12;
donpcevent "arena#80::Onstart";
disablewaitingroomevent;
@@ -33,18 +32,6 @@ Onstart:
end;
}
-force_4-1,99,12,1 script ArenaFee#80 139,1,1,{
-
-OnInit:
- disablenpc "ArenaFee#80";
- end;
-
-OnTouch:
- set Zeny,Zeny -1000;
- disablenpc "ArenaFee#80";
- end;
-}
-
force_4-1,99,20,4 script Octus#arena 124,{
end;
diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt
index f0223b8bb..0e83648e6 100644
--- a/npc/other/comodo_gambling.txt
+++ b/npc/other/comodo_gambling.txt
@@ -3,11 +3,11 @@
//===== By: ==================================================
//= Reddozen, Cypress, Zefris
//===== Current Version: =====================================
-//= 1.2
+//= 1.4
//===== Compatible With: =====================================
-//= rAthena SVN 6769+ (temporary npc variables)
+//= Any rAthena SVN
//===== Description: =========================================
-//= Random items from 3carat diamonds in Comodo
+//= Comodo Gambling: Win random Items with 3 Carat Diamonds.
//===== Additional Comments: =================================
//= 0.1- so far just a basic setup, and working on the function
//= 0.2- fixed some spelling errors and set zeny,zeny - (@amount * 55000)[Cypress]
@@ -22,9 +22,10 @@
//= 1.1- Updated prizes according to 11.1 NPC [Paradox924X]
//= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.3 Added missing item. [Kisuka]
+//= 1.4 Updated Script to match AEGIS file. [Masao]
//============================================================
-comodo,219,160,3 script Kachua 91,{
+comodo,219,158,6 script Kachua 91,{
cutin "katsua01.bmp",2;
@@ -86,7 +87,6 @@ comodo,219,160,3 script Kachua 91,{
cutin "katsua01.bmp",255;
close;
}
-
delitem 732,1;
mes "[Kachua]";
@@ -250,7 +250,8 @@ comodo,219,160,3 script Kachua 91,{
else if ((.@gamble2 > 7) && (.@gamble2 < 11)) set .@item,2507; // Ancient Cape
else if (.@gamble2 == 11) set .@item,2513; // Heavenly Maiden Robe[1]
else if (.@gamble2 == 12) set .@item,2514; // Pauldron[1]
- else if (.@gamble2 > 12 && .@gamble2 < 15) set .@item,2523; // Undershirt[1]
+ else if (.@gamble2 == 13) set .@item,2523; // Undershirt[1]
+ else if (.@gamble2 == 14) set .@item,2530; // Rider Insigna[1]
else if (.@gamble2 == 15) set .@item,2509; // Survivor's Manteau
else if (.@gamble2 == 16) set .@item,2515; // Eagle Wing[1]
}
@@ -388,253 +389,186 @@ comodo,219,160,3 script Kachua 91,{
end;
}
-mjolnir_02,85,364,3 script Blacksmith Miner 726,{
-
- mes "[Dwayne]";
- mes "Wahahahaha~";
- mes "I've dug up a fortune!";
- next;
-
- mes "[Dwayne]";
- mes "Diamonds! Hundreds and";
- mes "thousands of Diamonds,";
- mes "all of them mine!";
- mes "I'm rich!";
- emotion e_heh;
- next;
-
- if (select("I want to buy some.", "Congratulations.") == 2) {
- mes "[Dwayne]";
- mes "Haha, thank you~";
- mes "If by any chance";
- mes "you need a diamond,";
- mes "please drop by.";
- mes "I'll sell them to";
- mes "you at a cheap price.";
- close;
- }
-
- mes "[Dwayne]";
- mes "Ah, you have an";
- mes "eye for valuables!";
- mes "Sure, sure why not!";
- mes "I'll give you a discount, too!";
- mes "55,000 Zeny for a diamond,";
- mes "how does that sound?";
- next;
-
- mes "[Dwayne]";
- mes "How many";
- mes "diamonds do you need?";
- mes "If you change your mind";
- mes "please enter '0' to cancel";
- next;
-
- while(1) {
- input .@amount;
- if (.@amount <= 0) {
- mes "[Dwayne]";
- mes "Alright, you've";
- mes "canceled the trade.";
- mes "Take care!";
- close;
- } else if (.@amount > 500) {
- mes "[Dwayne]";
- mes "The maximum number you can enter is 500.";
- mes "Please enter no more than 500.";
- next;
- } else {
- break;
- }
- }
-
- set .@price, .@amount * 55000;
- if (Zeny < .@price) {
- mes "[Dwayne]";
- mes "Hahahaha~";
- mes "You can't fool me!";
- mes "You don't have enough";
- mes "Zeny for that many!";
- close;
- }
-
- if (!checkweight(732, .@amount)) {
- mes "[Dwayne]";
- mes "Errr... You brought too many things.";
- mes "You can't receive this item at this time.";
- mes "You better reorganise your inventory and try again.";
- close;
- }
-
- set Zeny, Zeny - .@price;
- getitem 732, .@amount;
-
- mes "[Dwayne]";
- mes "Thank you for";
- mes "buying my diamonds!";
- mes "You're welcome to";
- mes "come back anytime.";
- close;
-}
-
comodo,204,148,7 script Devellin 90,{
- mes "[Devellin]";
- mes "It seems some traveller showed";
- mes "a huge diamond to Kachua a while";
- mes "ago. Ever since then, all she's";
- mes "been talking about is diamonds and";
- mes "how much she wants them.";
+ mes "[Devellin]"{
+ mes "It seems some traveller showed"{
+ mes "a huge diamond to Kachua a while ago. Ever since then, all she's been talking about is diamonds and how much she wants them."{
next;
- mes "[Devellin]";
- mes "She's been getting pretty obsessive";
- mes "about it, which scares me. It seems";
- mes "she's more than willing to";
- mes "sacrifice anything she owns for a";
- mes "diamond.";
+ mes "[Devellin]"{
+ mes "She's been getting pretty obsessive about it, which scares me. It seems she's more than willing to sacrifice anything she owns for a diamond."{
next;
- mes "[Devellin]";
- mes "She's the type of person who'll do";
- mes "anything to get what she wants. I'm";
- mes "worried that she might give away";
- mes "something far more valuable than a";
- mes "diamond in exchange...";
+ mes "[Devellin]"{
+ mes "She's the type of person who'll do anything to get what she wants. I'm worried that she might give away something far more valuable than a diamond in exchange..."{
close;
}
-comodo,210,154,4 script Suspicious Guy#cmd 118,{
+comodo,210,154,2 script Suspicious Guy 118,{
- if (BaseClass == Job_Thief) {
-
+ if (BaseClass == Job_Thief){
mes "[Cain]";
mes "Heeeey...";
- mes "It seems we share the same line of";
- mes "work, you and me, Heh heh, lemme";
- mes "give you a hot tip.";
+ mes "It seems we share the same line of work, you and me. Heh heh, lemme give you a hot tip.";
next;
mes "[Cain]";
- mes "I've been charging other people for";
- mes "this information, but since, shall";
- mes "we say, we work in the same";
- mes "professional field, I don't have";
- mes "the heart to take your zeny.";
+ mes "I've been charging other people for this information, but since, shall we say, we work in the same professional field, I don't have the heart to take your zeny.";
next;
mes "[Cain]";
mes "You see that lady over there?";
- mes "She's just totally in love with" ;
- mes "diamonds. And from what my sources";
- mes "tell me, she's loaded. Tons and";
- mes "tons of valuables.";
+ mes "She's just totally in love with diamonds. And from what my sources tell me, she's loaded. Tons and tons of valuables.";
next;
mes "[Cain]";
- mes "I'm talking' rare items.";
- mes "I took the liberty of sneaking a";
- mes "peek at what she owns, and saw";
- mes "she's got a helmet with goat horns";
- mes "and even a crown! She's so rich";
- mes "it's ridiculous!";
+ mes "I'm talkin' rare items.";
+ mes "I took the liberty of sneaking a peek at what she owns, and saw she's got a helmet with goat horns and even a crown! She's so rich it's ridiculous!";
next;
mes "[Cain]";
- mes "The buzz that's been going around";
- mes "is that she's got a cache of rare";
- mes "equipment and weapons too! So";
- mes "whaddya say? Wanna be partners in";
- mes "crime and rob her house?";
+ mes "The buzz that's been going around is that she's got a cache of rare equipment and weapons too! So whaddya say? Wanna be partners in crime and rob her house?";
next;
- if (select("No, thanks.", "Sweet, I'm in.") == 1) {
+ switch(select("No, thanks.:Sweet, I'm in!")){
+ case 1:
mes "[Cain]";
- mes "Wha... ?";
- mes "C'mon I thought pilfering was";
- mes "something you do! Aw well, I'm";
- mes "gonna do it, but stay hushed on";
- mes "this, got it?";
+ mes "Wha...?";
+ mes "C'mon! I thought pilfering was something you do! Aw well, I'm gonna do it, but stay hushed on this, got it?";
close;
- }
- mes "[Cain]";
- mes "Ha ha ha!";
- mes "... Dork!";
- mes "I'm just jivin'";
- mes "so fuggedabout it!";
- next;
- mes "[Cain]";
- mes "Ah right. Supposedly, there's a";
- mes "mountain where tons of diamonds are";
- mes "burried. A pal o'mine says there's";
- mes "a mine near the mountain too, so I";
- mes "guess if you went to the mine,";
- mes "you'd find Diamonds.";
- next;
- mes "[Cain]";
- mes "I guess it can't hurt to gather";
- mes "some Diamonds there and try to";
- mes "exchange them for whatever the old";
- mes "lady's got. Take care, pal~";
- close;
-
- } else {
-
- mes "[Cain]";
- mes "Hey...";
- mes "I got a hot tip for you.";
- mes "It'll cost you 500 zeny";
- mes "and trust me, it's worth it.";
- mes "So whaddya say... ?";
- next;
- if (select("Alright.", "No, thanks.") == 2) {
+ case 2:
+ mes "[Cain]";
+ mes "Ha ha ha!";
+ mes "...^660000Dork^000000!";
+ mes "I'm just jivin'";
+ mes "sp fuggedabout it!";
+ next;
+ mes "[Cain]";
+ mes "Ah right. Supposedly, there's a mountain where tons of diamonds are buried. A pal o' mine says there's a mine near the mountain too, so I guess if you went to the mine, you'd find Diamonds.";
+ next;
mes "[Cain]";
- mes "Hey hey!";
- mes "What are you, a cheapskate? You";
- mes "understand that everything has its";
- mes "price and this information is so";
- mes "worth it. C'mon, you can't pass";
- mes "this up, can you?";
+ mes "I guess it can't hurt to gather some Diamonds there and try to exchange them for whatever the old lady's got. Take care, pal~";
close;
}
- if(Zeny < 500) {
+ }
+ mes "[Cain]";
+ mes "Hey...";
+ mes "I got a hot tip for you.";
+ mes "It'll just cost you 500 zeny";
+ mes "and trust me, it's worth it.";
+ mes "So whaddya say...?";
+ next;
+ switch(select("Alright.:No, thanks.")){
+ case 1:
+ if (Zeny > 499){
+ mes "[Cain]";
+ mes "You see that lady over there? She's just totally in love with diamonds. And from what my sources tell me, she's loaded. Tons and tons of valuables.";
+ next;
+ mes "[Cain]";
+ mes "I'm talkin' rare items.";
+ mes "I took the liberty of sneaking a peek at what she owns, and saw she's got a helmet with goat horns and even a crown! She's so rich it's ridiculous!";
+ next;
mes "[Cain]";
- mes "What the hell?!";
- mes "Don't you even have any money? Didn't I";
- mes "say 500 zeny? Hey man, Info like";
- mes "this doesn't come cheap!";
+ mes "There's a chance that rare equipment and weapons might be yours! She'll give anything for a 3 carat diamond. So if you have any of those, you might as well see her.";
+ next;
+ mes "[Cain]";
+ mes "Ah right. Supposedly, there's a mountain where tons of diamonds";
+ mes "are buried. A pal o' mine says there's a mine near the mountain too, so I guess if you went to the mine, you'd find Diamonds.";
+ next;
+ mes "[Cain]";
+ mes "I guess it can't hurt to gather some Diamonds there and try to exchange them for whatever the old lady's got. Take care, pal~";
+ set Zeny,Zeny-500;
close;
}
- set Zeny, Zeny - 500;
mes "[Cain]";
- mes "You see that lady over there?";
- mes "She's just totally in love with" ;
- mes "diamonds. And from what my sources";
- mes "tell me, she's loaded. Tons and";
- mes "tons of valuables.";
- next;
- mes "[Cain]";
- mes "I'm talking' rare items.";
- mes "I took the liberty of sneaking a";
- mes "peek at what she owns, and saw";
- mes "she's got a helmet with goat horns";
- mes "and even a crown! She's so rich";
- mes "it's ridiculous!";
- next;
+ mes "What the hell?!";
+ mes "Don't you have any money? Didn't I say 500 zeny? Hey man, info like this doesn't come cheap!";
+ close;
+ case 2:
mes "[Cain]";
- mes "There's a chance that rare";
- mes "equipment and weapons might be";
- mes "yours! She'll give anything for a";
- mes "3carat diamond. So if you have any";
- mes "of those, you might as well see";
- mes "her.";
+ mes "Hey hey!";
+ mes "What are you, a cheapskate? You understand that everything has its price and this information is so worth it. C'mon, you can't pass this up, can you?";
+ close;
+ }
+}
+
+mjolnir_02,85,362,3 script Blacksmith Miner 726,{
+
+ if(checkweight(1201,1) == 0)
+ {
+ mes "[Kachua]";
+ mes "^3355FFWait a second! Right now, you're carrying too many items with you. Please come back after putting some of your things into Kafra Storage.^000000";
+ close;
+ }
+ mes "[Dwayne]";
+ mes "Wahahahaha~";
+ mes "I've dug up a fortune!";
+ next;
+ mes "[Dwayne]";
+ mes "Diamonds! Hundreds and";
+ mes "thousands of Diamonds,";
+ mes "all of them mine!";
+ mes "I'm rich!";
+ emotion 18;
+ next;
+ switch(select("I want to buy some.:Congratulations.")){
+ case 1:
+ mes "[Dwayne]";
+ mes "Ah, you have an";
+ mes "eye for valuables!";
+ mes "Sure, sure why not!";
+ mes "I'll give you a discount, too!";
+ mes "55,000 Zeny for a diamond,";
+ mes "how does that sound?";
next;
- mes "[Cain]";
- mes "Ah right. Supposedly, there's a";
- mes "mountain where tons of diamonds";
- mes "are burried. A pal o'mine says";
- mes "there's a mine near the mountain";
- mes "too, so I guess if you went to the";
- mes "mine, you'd find Diamonds.";
+ mes "[Dwayne]";
+ mes "How many";
+ mes "diamonds do you need?";
+ mes "If you change your mind,";
+ mes "please enter '0' to cancel.";
next;
- mes "[Cain]";
- mes "I guess it can't hurt to gather";
- mes "some Diamonds there and try to";
- mes "exchange them for whatever the old";
- mes "lady's got. Take care, pal~";
+ input .@amount;
+ if (.@amount == 0){
+ mes "[Dwayne]";
+ mes "Alright, you've";
+ mes "canceled the trade.";
+ mes "Take care!";
+ close;
+ }else if (.@amount < 1 || .@amount > 500){
+ mes "[Dwayne]";
+ mes "The maximum";
+ mes "amount is 500.";
+ mes "Please enter 500 or less.";
+ close;
+ }
+ set .@cost,.@amount * 55000;
+ set .@weight,.@amount * 100;
+ if (Zeny < .@cost){
+ mes "[Dwayne]";
+ mes "Errr...";
+ mes "I'm sorry, but you";
+ mes "do not have enough money.";
+ mes "I'll be losing money if";
+ mes "I sell them at that price.";
+ close;
+ }
+ if (Weight < .@weight){
+ mes "[Dwayne]";
+ mes "Errr...";
+ mes "You're carrying too many items.";
+ mes "I don't think give you anything if there's no room in your inventory. Why don't you put some of your stuff into Kafra Storage?";
+ close;
+ }
+ set Zeny,Zeny - .@cost;
+ getitem 732,.@amount;
+ mes "[Dwayne]";
+ mes "Thank you for";
+ mes "buying my diamonds!";
+ mes "You're welcome to";
+ mes "come back anytime.";
+ close;
+ case 2:
+ mes "[Dwayne]";
+ mes "Haha, thank you~";
+ mes "If by any chance";
+ mes "you need a diamond,";
+ mes "please drop by.";
+ mes "I'll sell them to";
+ mes "you at a cheap price.";
close;
}
-}
+} \ No newline at end of file
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index ff4d29000..5f577af9d 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/npc/quests/Kiel_Hyre_Quest.txt
@@ -1191,6 +1191,7 @@ kh_school,179,39,0 script Cute Student#kh 895,{
set KielHyreQuest,8;
//KHPubMasterEnd no longer needed-- deleting.
set KHPubMasterEnd,0;
+ set KHToastGirlEnd,0;
emotion e_ho;
}
}
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 6970a4a58..9a45914f4 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -2679,7 +2679,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
mes "......";
mes "...No!";
mes "Look what";
- mes "made me do!";
+ mes "you made me do!";
next;
emotion e_sob;
mes "[Sir Jore]";
@@ -2754,10 +2754,10 @@ aldeba_in,155,101,3 script Sir Jore#sign 805,7,7,{
next;
set sign_q,16;
mes "[Sir Jore]";
- mes "Just bring";
- mes "10 Empty Test Tube,";
- mes "10 Green Herb and";
- mes "2 Yggdrasil Leaf.";
+ mes "Just bring me";
+ mes "10 Empty Test Tubes,";
+ mes "10 Green Herbs and";
+ mes "2 Yggdrasil Leafs.";
next;
mes "[Sir Jore]";
mes "You see, l-lately I've";
@@ -8486,7 +8486,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "to find some ancient";
mes "or really aged paper...";
next;
- if (countitem(1097) > 6) {
+ if (countitem(1097) > 9) {
mes "[Cyon]";
mes "How did you find these";
mes "Worn Out Pages? This is great,";
@@ -8506,7 +8506,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{
mes "Just as I thought!";
mes "The Sobbing Starlight is responding to these Worn Out Pages! Excellent! I've finally fulfilled my promise to Metz! Now he can leave";
mes "me alone!";
- delitem 1097,7; //Worn_Out_Page
+ delitem 1097,10; //Worn_Out_Page
set sign_q,76;
getitem 7275,1; //Ancient_Document
close;
diff --git a/npc/quests/gunslinger_quests.txt b/npc/quests/gunslinger_quests.txt
index 503a8923a..5c59020a1 100644
--- a/npc/quests/gunslinger_quests.txt
+++ b/npc/quests/gunslinger_quests.txt
@@ -252,6 +252,10 @@ que_ng,182,85,3 script Garrison 109,{
callsub SubGarrison;
case 2:
callsub SubGarrison_;
+ case 3:
+ mes "[Garrison]";
+ mes "I'll see you when I see you~";
+ close;
}
}
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 23a1add3a..6d551141f 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -10003,7 +10003,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 421,{
close;
}
else {
- // custom translation
+ // custom translation
mes "Ferocious Gorurug welcomes you gracefully.";
next;
mes "[Ferocious Gorurug]";
diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt
index 840947699..231cee0af 100644
--- a/npc/quests/quests_amatsu.txt
+++ b/npc/quests/quests_amatsu.txt
@@ -722,8 +722,8 @@ OnTouch:
set event_momo,3;
warp "amatsu",223,230;
disablenpc "Coach#after";
- donpcevent "Assistant#ama::Onreset";
donpcevent "Timer#ama::OnDisable";
+ donpcevent "Assistant#ama::Onreset";
end;
}
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index c12e0a7b3..d19f10405 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -11346,7 +11346,7 @@ moscovia,178,127,0 script The Blacksmith#rus06 63,{
mes "And don't forget to wear these!";
delitem 999,25;
set rhea_rus_main,8;
- if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer) {
+ if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer || BaseClass == Job_Ninja || BaseClass == Job_Gunslinger) {
getitem 2429,1;
close;
}else {
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 01:03:58 +0000