summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/custom/warper.txt4
-rw-r--r--npc/merchants/renters.txt46
-rw-r--r--npc/quests/quests_dicastes.txt7
3 files changed, 44 insertions, 13 deletions
diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt
index bcf8cd420..471033bf6 100644
--- a/npc/custom/warper.txt
+++ b/npc/custom/warper.txt
@@ -142,7 +142,7 @@ F6: setarray @c[2],142,225,182,141,187,228,185,173,216,173,195,148,272,220,173,2
F7: setarray @c[2],143,132,143,217;
Disp("El Dicastes Field",1,2); Pick("dic_fild");
F8: setarray @c[0],46,199,213,204,195,212,257,192,188,171,166,263,248,158,195,191,186,183,221,117,178,218,136,328,240,181,235,235,211,185;
- Disp("Geffen Field",0,14); Pick("gef_fild");
+ Disp("Geffen Field",0,14); Pick("gef_fild",1);
F9: setarray @c[2],220,227;
Disp("Gonryun Field",1,1); Pick("gon_fild");
F10: setarray @c[2],268,101,222,193,232,185,252,189,196,106,216,220,227,197;
@@ -164,7 +164,7 @@ F17: setarray @c[2],215,229,167,234;
F18: setarray @c[2],158,206,151,219,205,148,186,247,134,204,193,235,200,177,137,189,201,224,160,205,194,150;
Disp("Payon Forest",1,11); Pick("pay_fild");
F19: setarray @c[0],208,227,190,206,240,206,190,143,307,252,239,213,185,188,193,194,187,218,210,183,195,149,198,164;
- Disp("Prontera Field",0,11); Pick("prt_fild");
+ Disp("Prontera Field",0,11); Pick("prt_fild",1);
F20: setarray @c[2],192,162,235,166,202,206,202,208,225,202,202,214,263,196,217,201,87,121,277,181,221,185,175,200,174,197;
Disp("Rachel Field",1,13); Pick("ra_fild");
F21: setarray @c[2],219,205,177,206,194,182,184,217,203,213,213,208,224,170,229,177,195,198,209,168,198,216,156,187,185,263,209,219,223,188,206,228,208,238,209,223,85,97,207,202,31,195,38,195;
diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt
index 3d56bf75a..a0a866ca5 100644
--- a/npc/merchants/renters.txt
+++ b/npc/merchants/renters.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88, mod by Lupus
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.7 Updated to Aegis 10.3 standards. [L0ne_W0lf]
//= 1.8 Added 3rd Job creature NPCs (Dragon/Gryphon) [L0ne_W0lf]
//= 1.9 Enabled Gryphon Renter NPC and added Mado Gear NPC. [Masao]
+//= 2.0 Fixed problems with third classes and new mounts. [Euphy]
//============================================================
// PecoPeco Breeder (for Knights)-------------------------------------------
@@ -30,7 +31,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{
if(Upper==2) set .@price,2500; //Baby Peco
mes "[Peco Peco Breeder]";
- if (BaseJob == Job_Knight) {
+ if (BaseJob == Job_Knight && Class < Job_Rune_Knight) {
mes "Welcome.";
mes "Honorable Knight,";
mes "would you like to rent";
@@ -62,6 +63,11 @@ prontera,55,350,5 script Peco Peco Breeder#knt 105,{
mes "Peco Peco.";
close;
}
+ else if(ismounting()) {
+ mes "[Peco Peco Breeder]";
+ mes "Please remove your cash mount.";
+ close;
+ }
set zeny,zeny-.@price;
setriding;
close;
@@ -88,7 +94,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{
if(Upper==2) set .@price,3500; //Baby Peco
mes "[PecoPeco Breeder]";
- if (BaseJob == Job_Crusader) {
+ if (BaseJob == Job_Crusader && Class < Job_Rune_Knight) {
if(Upper != 1 ) mes "Welcome, Crusader.";
else mes "Welcome, Paladin.";
mes "We have a special";
@@ -107,7 +113,6 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{
mes "bring "+.@price+" zeny...";
close;
}
-
else if(getskilllv("KN_RIDING") == 0) {
mes "[Peco Peco Breeder]";
mes "You must first learn";
@@ -121,6 +126,11 @@ prontera,232,318,3 script Peco Peco Breeder#cru 105,{
mes "mounted on a Peco Peco.";
close;
}
+ else if(ismounting()) {
+ mes "[Peco Peco Breeder]";
+ mes "Please remove your cash mount.";
+ close;
+ }
set zeny,zeny-.@price;
setriding;
close;
@@ -217,11 +227,16 @@ job3_rune01,88,62,5 script Dragon Breeder 105,{
mes "Please learn how to ride a Dragon first.";
close;
}
- if (checkriding()) {
+ else if (checkriding()) {
mes "[Dragon Breeder]";
mes "You already have a Dragon.";
close;
}
+ else if(ismounting()) {
+ mes "[Dragon Breeder]";
+ mes "Please remove your cash mount.";
+ close;
+ }
setdragon;
close;
case 2:
@@ -249,11 +264,16 @@ prontera,130,213,5 script Riding Creature Master 105,{
mes "Please learn how to ride a Dragon first.";
close;
}
- if (checkriding()) {
+ else if (checkriding()) {
mes "[Riding Creature Master]";
mes "You already have a Dragon.";
close;
}
+ else if(ismounting()) {
+ mes "[Riding Creature Master]";
+ mes "Please remove your cash mount.";
+ close;
+ }
setdragon;
close;
case 2:
@@ -272,11 +292,16 @@ prontera,130,213,5 script Riding Creature Master 105,{
mes "Please learn how to ride a Gryphon first.";
close;
}
- if (checkriding()) {
+ else if (checkriding()) {
mes "[Riding Creature Master]";
mes "You already have a Gryphon.";
close;
}
+ else if(ismounting()) {
+ mes "[Riding Creature Master]";
+ mes "Please remove your cash mount.";
+ close;
+ }
setriding;
close;
case 2:
@@ -332,11 +357,16 @@ prontera,163,178,4 script Magic Gear Master 105,{
mes "Please learn how to use a Magic Gear first.";
close;
}
- if (checkmadogear()) {
+ else if (checkmadogear()) {
mes "[Magic Gear Master]";
mes "You already have a Magic Gear.";
close;
}
+ else if(ismounting()) {
+ mes "[Magic Gear Master]";
+ mes "Please remove your cash mount.";
+ close;
+ }
setmadogear;
close;
case 2:
diff --git a/npc/quests/quests_dicastes.txt b/npc/quests/quests_dicastes.txt
index f63769aba..2d1132cff 100644
--- a/npc/quests/quests_dicastes.txt
+++ b/npc/quests/quests_dicastes.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Gennosuke Kouga
//===== Current Version: =====================================
-//= 1.2
+//= 1.2a
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 1.0 First version. 14107 lines, oh, the pain...
//= 1.1 Standardized and reduced by 7000+ lines. [Euphy]
//= 1.2 Further optimization. [Euphy]
+//= 1.2a Small bug fix. [Euphy]
//============================================================
// Entrance
@@ -6507,10 +6508,10 @@ dic_in01,353,37,5 script Kareka#pa0829 460,{
mes "Please come back again";
close; }
mes "[Kareka]";
- if (EP13Enchant2 > 1) {
+ if (EP13Enchant2 > 1 && countitem(6304) < 3) {
mes "Sorry, but you need to know... your Sapha is not enough to do third stage, please come back again.";
close; }
- else if (EP13Enchant1 > 1) {
+ else if ((EP13Enchant1 > 1 && countitem(6304) < 2) || (EP13Enchant1 == 0 && countitem(6304) < 1)) {
mes "Please come back here when you collect enough Sapha.";
close; }
mes "Then let's start.";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 22:11:13 +0000