summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/pre-re/kafras/kafras_izl.txt7
-rw-r--r--npc/pre-re/kafras/kafras_new.txt2
-rw-r--r--npc/pre-re/kafras/kafras_pay.txt5
-rw-r--r--npc/pre-re/merchants/3rd_trader.txt7
-rw-r--r--npc/pre-re/other/bulletin_boards.txt7
-rw-r--r--npc/pre-re/quests/eden/eden_common.txt22
-rw-r--r--npc/re/kafras/kafras_izl.txt5
-rw-r--r--npc/re/kafras/kafras_new.txt5
-rw-r--r--npc/re/kafras/kafras_pay.txt5
-rw-r--r--npc/re/merchants/3rd_trader.txt7
-rw-r--r--npc/re/other/bulletin_boards.txt7
-rw-r--r--npc/re/quests/eden/eden_common.txt17
12 files changed, 70 insertions, 26 deletions
diff --git a/npc/pre-re/kafras/kafras_izl.txt b/npc/pre-re/kafras/kafras_izl.txt
index ec42d2359..eaf689c6a 100644
--- a/npc/pre-re/kafras/kafras_izl.txt
+++ b/npc/pre-re/kafras/kafras_izl.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= rAthena Dev Team
//===== Current Version: ===================
-//= 2.3
+//= 2.4
//===== Compatible With: =====================
//= rAthena 1.0
//===== Description: ============================================
@@ -20,15 +20,16 @@
//= v2.1b Minor changes to function calls. Using arguments.
//= This version uses arrays .[kobra_k88]
//= 2.2 New teleport destinations, prices [Lupus]
-//= 2.21 Warps to Prontera rather than Payon now [Evera]
+//= 2.2a Warps to Prontera rather than Payon now [Evera]
//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
//= Added unique Kafra Welcome message2.
+//= 2.4 Izlude Kafra doesn't warp to Prontera but to Payon. [Masao]
//=====================================================================
izlude,134,87,3 script Kafra Employee::kaf_izlude 117,{
cutin "kafra_01",2;
cleararray @wrpC$[0],"",getarraysize(@wrpC$);
- setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
+ setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
setarray @wrpP[0], 1200, 1200, 1200, 1800;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
diff --git a/npc/pre-re/kafras/kafras_new.txt b/npc/pre-re/kafras/kafras_new.txt
index ea9ab2f09..a7479115f 100644
--- a/npc/pre-re/kafras/kafras_new.txt
+++ b/npc/pre-re/kafras/kafras_new.txt
@@ -196,7 +196,7 @@ louyang,210,104,5 script Kafra Employee::kaf_louyang 117,{
}
// Umbala Kafra ------------------------------------------------------------
-umbala,128,133,4 script Kafra Employee::kaf_umbala 721,{
+umbala,87,160,4 script Kafra Employee::kaf_umbala 721,{
cutin "kafra_07",2;
cleararray @wrpC$[0],"",getarraysize(@wrpC$);
setarray @wrpD$[0], "Comodo";
diff --git a/npc/pre-re/kafras/kafras_pay.txt b/npc/pre-re/kafras/kafras_pay.txt
index caf636bba..b02aadd03 100644
--- a/npc/pre-re/kafras/kafras_pay.txt
+++ b/npc/pre-re/kafras/kafras_pay.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= rAthena Dev Team
//===== Current Version: ===================
-//= 2.4b
+//= 2.5
//===== Compatible With: =====================
//= rAthena 1.0
//===== Description: ============================================
@@ -26,6 +26,7 @@
//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
//= Added unique Kafra Welcome message.
//= 2.4b Updated the remaning names for the Kafras. [L0ne_W0lf]
+//= 2.5 Changed Order in the Warp menu to official. [Masao]
//==========================================================================
@@ -83,7 +84,7 @@ pay_arche,55,123,0 script Kafra Employee::kaf_payon3 115,{
// Function: Sets variables for Payon Kafras ---------------------------------
function script F_KafSetPay {
cleararray @wrpC$[0],"",getarraysize(@wrpC$);
- setarray @wrpD$[0], "Alberta", "Prontera", "Morroc";
+ setarray @wrpD$[0], "Prontera", "Alberta", "Morroc";
setarray @wrpP[0], 1200, 1200, 1200;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
diff --git a/npc/pre-re/merchants/3rd_trader.txt b/npc/pre-re/merchants/3rd_trader.txt
index d8b543968..908bc7ad6 100644
--- a/npc/pre-re/merchants/3rd_trader.txt
+++ b/npc/pre-re/merchants/3rd_trader.txt
@@ -359,7 +359,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 49,{
close;
}
-gef_tower,105,172,5 script Point Salesman#Sorcerer 700,{
+gef_tower,105,172,5 script Point Salesman#Sorcerer::pss 700,{
if(checkweight(1201,1) == 0 || MaxWeight - Weight < 20000)
{
@@ -518,4 +518,7 @@ gef_tower,105,172,5 script Point Salesman#Sorcerer 700,{
morocc,190,96,4 duplicate(PHS) Poison Herb Salesman#moc 877
lhz_in02,16,205,4 duplicate(PHS) Poison Herb Salesman#lhz 877
-prontera,168,228,3 duplicate(runesale) Rune Salesman#1 853 \ No newline at end of file
+prontera,168,228,3 duplicate(runesale) Rune Salesman#1 853
+comodo,241,103,6 duplicate(pss) Point Salesman#1 700
+alberta,105,52,7 duplicate(pss) Point Salesman#2 700
+veins,202,128,6 duplicate(pss) Point Salesman#3 700 \ No newline at end of file
diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt
index 3bed8b7e6..3047f2ace 100644
--- a/npc/pre-re/other/bulletin_boards.txt
+++ b/npc/pre-re/other/bulletin_boards.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
@@ -19,6 +19,7 @@
//= 1.5b Fixed another small screw up with the color codes in the Glastheim BB [Kayla]
//= 1.6 Removed Duplicates [Silent]
//= 1.7 Updated MOrroc NPCs to reflect episode 12.1 changes. [L0ne_W0lf]
+//= 1.8 Updated Payon Cave Bulletion Board Locations. [Masao]
//============================================================
alberta,111,59,5 script Bulletin Board#1 837,{
@@ -131,7 +132,7 @@ payon,178,108,5 script Bulletin Board#06 837,{
close;
}
-pay_arche,79,30,5 script Bulletin Board#07 837,{
+pay_arche,79,31,5 script Bulletin Board#07 837,{
mes "[Archer Village]";
mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer.";
next;
@@ -143,7 +144,7 @@ pay_arche,79,30,5 script Bulletin Board#07 837,{
close;
}
-pay_arche,40,135,5 script Bulletin Board#08 837,{
+pay_arche,39,134,5 script Bulletin Board#08 837,{
mes "[Payon Cave]";
mes "^6B1312Caution!^000000";
mes "Payon Cave consists of 5 levels full of Undead and Demon monsters. Beware of swarms of Hydra in the third and fourth levels.";
diff --git a/npc/pre-re/quests/eden/eden_common.txt b/npc/pre-re/quests/eden/eden_common.txt
index 327b034c9..760ebd787 100644
--- a/npc/pre-re/quests/eden/eden_common.txt
+++ b/npc/pre-re/quests/eden/eden_common.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.5
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -14,6 +14,8 @@
//= Commented out warps that should not be active.
//= 1.2 Reduced 300+ copy-paste lines to 1 duplicated NPC. [Brian]
//= 1.3 Some little optimization here and there. [Masao]
+//= 1.4 Updated to match the new Izlude Map. [Masao]
+//= 1.5 Added some missing Eden Group Teleport Officers. [Masao]
//============================================================
moc_para01,27,35,5 script Secretary Lime Evenor 952,{
@@ -220,7 +222,7 @@ moc_ruins,68,164,3 duplicate(eto) Eden Teleport Officer#2 729
geffen,132,66,3 duplicate(eto) Eden Teleport Officer#3 729
alberta,124,67,3 duplicate(eto) Eden Teleport Officer#4 729
aldebaran,133,119,5 duplicate(eto) Eden Teleport Officer#5 729
-izlude_in,68,162,1 duplicate(eto) Eden Teleport Officer#6 729
+izlude,131,148,4 duplicate(eto) Eden Teleport Officer#6 729
prt_church,103,78,3 duplicate(eto) Eden Teleport Officer#7 729
geffen_in,160,104,5 duplicate(eto) Eden Teleport Officer#8 729
moc_prydb1,53,126,3 duplicate(eto) Eden Teleport Officer#9 729
@@ -231,6 +233,13 @@ que_ng,33,73,3 duplicate(eto) Eden Teleport Officer#13 729
que_ng,144,161,5 duplicate(eto) Eden Teleport Officer#14 729
yuno,144,189,5 duplicate(eto) Eden Teleport Officer#15 729
rachel,125,144,3 duplicate(eto) Eden Teleport Officer#16 729
+morocc,161,97,6 duplicate(eto) Eden Teleport Officer#16 729
+comodo,202,151,4 duplicate(eto) Eden Teleport Officer#17 729
+umbala,104,158,4 duplicate(eto) Eden Teleport Officer#18 729
+veins,220,109,4 duplicate(eto) Eden Teleport Officer#19 729
+lighthalzen,164,86,4 duplicate(eto) Eden Teleport Officer#20 729
+einbroch,250,211,4 duplicate(eto) Eden Teleport Officer#21 729
+hugel,93,153,4 duplicate(eto) Eden Teleport Officer#22 729
moc_para01,30,10,0 script #eden_out 45,1,1,{
@@ -241,7 +250,7 @@ OnTouch:
case 3: warp "geffen",120,39; end;
case 4: warp "alberta",117,56; end;
case 5: warp "aldebaran",168,112; end;
- case 6: warp "izlude_in",73,165; end;
+ case 6: warp "izlude",127,142; end;
case 7: warp "prt_church",99,78; end;
case 8: warp "geffen_in",162,99; end;
case 9: warp "moc_prydb1",51,118; end;
@@ -252,6 +261,13 @@ OnTouch:
case 14: warp "que_ng",144,166; end;
case 15: warp "yuno",158,125; end;
case 16: warp "rachel",115,125; end;
+ case 17: warp "morocc",156,93; end;
+ case 18: warp "comodo",209,143; end;
+ case 19: warp "umbala",99,155; end;
+ case 20: warp "veins",215,115; end;
+ case 21: warp "lighthalzen",158,92; end;
+ case 22: warp "einbroch",245,210; end;
+ case 23: warp "hugel",95,145; end;
default: warp "prontera",116,72; end;
}
end;
diff --git a/npc/re/kafras/kafras_izl.txt b/npc/re/kafras/kafras_izl.txt
index d15440c19..613054483 100644
--- a/npc/re/kafras/kafras_izl.txt
+++ b/npc/re/kafras/kafras_izl.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= rAthena Dev Team
//===== Current Version: ===================
-//= 2.3
+//= 2.4
//===== Compatible With: =====================
//= rAthena 1.0
//===== Description: ============================================
@@ -23,12 +23,13 @@
//= 2.21 Warps to Prontera rather than Payon now [Evera]
//= 2.3 Updated function calls with new arguments. [L0ne_W0lf]
//= Added unique Kafra Welcome message2.
+//= 2.4 Izlude Kafra doesn't warp to Prontera but to Payon. [Masao]
//=====================================================================
izlude,128,148,6 script Kafra Employee::kaf_izlude 117,{
cutin "kafra_01",2;
cleararray @wrpC$[0],"",getarraysize(@wrpC$);
- setarray @wrpD$[0], "Geffen", "Prontera", "Morroc", "Al De Baran";
+ setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
setarray @wrpP[0], 1200, 1200, 1200, 1800;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
diff --git a/npc/re/kafras/kafras_new.txt b/npc/re/kafras/kafras_new.txt
index ea9ab2f09..ede7e9bb1 100644
--- a/npc/re/kafras/kafras_new.txt
+++ b/npc/re/kafras/kafras_new.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= rAthena Dev Team
//===== Current Version: ===================
-//= 3.1
+//= 3.2
//===== Compatible With: =====================
//= rAthena 1.0
//===== Description: ============================================
@@ -33,6 +33,7 @@
//= 3.0 Updated function calls with new arguments. [L0ne_W0lf]
//= Added unique Kafra Welcome messages.
//= 3.1 Fixed one of Einbroch (east) kafras not displaying a name, bugreport:857 [Brainstorm]
+//= 3.2 Changed Umbala Kafra Position to official. [Masao]
//==========================================================================
// Amatsu ------------------------------------------------------------------
@@ -196,7 +197,7 @@ louyang,210,104,5 script Kafra Employee::kaf_louyang 117,{
}
// Umbala Kafra ------------------------------------------------------------
-umbala,128,133,4 script Kafra Employee::kaf_umbala 721,{
+umbala,87,160,4 script Kafra Employee::kaf_umbala 721,{
cutin "kafra_07",2;
cleararray @wrpC$[0],"",getarraysize(@wrpC$);
setarray @wrpD$[0], "Comodo";
diff --git a/npc/re/kafras/kafras_pay.txt b/npc/re/kafras/kafras_pay.txt
index caf636bba..b02aadd03 100644
--- a/npc/re/kafras/kafras_pay.txt
+++ b/npc/re/kafras/kafras_pay.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= rAthena Dev Team
//===== Current Version: ===================
-//= 2.4b
+//= 2.5
//===== Compatible With: =====================
//= rAthena 1.0
//===== Description: ============================================
@@ -26,6 +26,7 @@
//= 2.4 Updated function calls with new arguments. [L0ne_W0lf]
//= Added unique Kafra Welcome message.
//= 2.4b Updated the remaning names for the Kafras. [L0ne_W0lf]
+//= 2.5 Changed Order in the Warp menu to official. [Masao]
//==========================================================================
@@ -83,7 +84,7 @@ pay_arche,55,123,0 script Kafra Employee::kaf_payon3 115,{
// Function: Sets variables for Payon Kafras ---------------------------------
function script F_KafSetPay {
cleararray @wrpC$[0],"",getarraysize(@wrpC$);
- setarray @wrpD$[0], "Alberta", "Prontera", "Morroc";
+ setarray @wrpD$[0], "Prontera", "Alberta", "Morroc";
setarray @wrpP[0], 1200, 1200, 1200;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt
index d8b543968..908bc7ad6 100644
--- a/npc/re/merchants/3rd_trader.txt
+++ b/npc/re/merchants/3rd_trader.txt
@@ -359,7 +359,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 49,{
close;
}
-gef_tower,105,172,5 script Point Salesman#Sorcerer 700,{
+gef_tower,105,172,5 script Point Salesman#Sorcerer::pss 700,{
if(checkweight(1201,1) == 0 || MaxWeight - Weight < 20000)
{
@@ -518,4 +518,7 @@ gef_tower,105,172,5 script Point Salesman#Sorcerer 700,{
morocc,190,96,4 duplicate(PHS) Poison Herb Salesman#moc 877
lhz_in02,16,205,4 duplicate(PHS) Poison Herb Salesman#lhz 877
-prontera,168,228,3 duplicate(runesale) Rune Salesman#1 853 \ No newline at end of file
+prontera,168,228,3 duplicate(runesale) Rune Salesman#1 853
+comodo,241,103,6 duplicate(pss) Point Salesman#1 700
+alberta,105,52,7 duplicate(pss) Point Salesman#2 700
+veins,202,128,6 duplicate(pss) Point Salesman#3 700 \ No newline at end of file
diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt
index 3bed8b7e6..3047f2ace 100644
--- a/npc/re/other/bulletin_boards.txt
+++ b/npc/re/other/bulletin_boards.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= MasterOfMuppets
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= Any Athena Version
//===== Additional Comments: =================================
@@ -19,6 +19,7 @@
//= 1.5b Fixed another small screw up with the color codes in the Glastheim BB [Kayla]
//= 1.6 Removed Duplicates [Silent]
//= 1.7 Updated MOrroc NPCs to reflect episode 12.1 changes. [L0ne_W0lf]
+//= 1.8 Updated Payon Cave Bulletion Board Locations. [Masao]
//============================================================
alberta,111,59,5 script Bulletin Board#1 837,{
@@ -131,7 +132,7 @@ payon,178,108,5 script Bulletin Board#06 837,{
close;
}
-pay_arche,79,30,5 script Bulletin Board#07 837,{
+pay_arche,79,31,5 script Bulletin Board#07 837,{
mes "[Archer Village]";
mes "Welcome to the Payon Archer Village where Novices can change their jobs to Archer.";
next;
@@ -143,7 +144,7 @@ pay_arche,79,30,5 script Bulletin Board#07 837,{
close;
}
-pay_arche,40,135,5 script Bulletin Board#08 837,{
+pay_arche,39,134,5 script Bulletin Board#08 837,{
mes "[Payon Cave]";
mes "^6B1312Caution!^000000";
mes "Payon Cave consists of 5 levels full of Undead and Demon monsters. Beware of swarms of Hydra in the third and fourth levels.";
diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt
index 13f4bd12a..760ebd787 100644
--- a/npc/re/quests/eden/eden_common.txt
+++ b/npc/re/quests/eden/eden_common.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -15,6 +15,7 @@
//= 1.2 Reduced 300+ copy-paste lines to 1 duplicated NPC. [Brian]
//= 1.3 Some little optimization here and there. [Masao]
//= 1.4 Updated to match the new Izlude Map. [Masao]
+//= 1.5 Added some missing Eden Group Teleport Officers. [Masao]
//============================================================
moc_para01,27,35,5 script Secretary Lime Evenor 952,{
@@ -232,6 +233,13 @@ que_ng,33,73,3 duplicate(eto) Eden Teleport Officer#13 729
que_ng,144,161,5 duplicate(eto) Eden Teleport Officer#14 729
yuno,144,189,5 duplicate(eto) Eden Teleport Officer#15 729
rachel,125,144,3 duplicate(eto) Eden Teleport Officer#16 729
+morocc,161,97,6 duplicate(eto) Eden Teleport Officer#16 729
+comodo,202,151,4 duplicate(eto) Eden Teleport Officer#17 729
+umbala,104,158,4 duplicate(eto) Eden Teleport Officer#18 729
+veins,220,109,4 duplicate(eto) Eden Teleport Officer#19 729
+lighthalzen,164,86,4 duplicate(eto) Eden Teleport Officer#20 729
+einbroch,250,211,4 duplicate(eto) Eden Teleport Officer#21 729
+hugel,93,153,4 duplicate(eto) Eden Teleport Officer#22 729
moc_para01,30,10,0 script #eden_out 45,1,1,{
@@ -253,6 +261,13 @@ OnTouch:
case 14: warp "que_ng",144,166; end;
case 15: warp "yuno",158,125; end;
case 16: warp "rachel",115,125; end;
+ case 17: warp "morocc",156,93; end;
+ case 18: warp "comodo",209,143; end;
+ case 19: warp "umbala",99,155; end;
+ case 20: warp "veins",215,115; end;
+ case 21: warp "lighthalzen",158,92; end;
+ case 22: warp "einbroch",245,210; end;
+ case 23: warp "hugel",95,145; end;
default: warp "prontera",116,72; end;
}
end;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-13 01:19:47 +0000