summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/kafras/kafras_com.txt5
-rw-r--r--npc/kafras/kafras_dungeons.txt18
-rw-r--r--npc/kafras/kafras_gef.txt7
-rw-r--r--npc/kafras/kafras_izl.txt5
-rw-r--r--npc/kafras/kafras_new.txt9
-rw-r--r--npc/kafras/kafras_pay.txt5
-rw-r--r--npc/kafras/kafras_pron.txt3
-rw-r--r--npc/kafras/kafras_yun.txt12
9 files changed, 26 insertions, 39 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 52e84188f..5bfdd9c45 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -32,6 +32,7 @@ Evera
Date Added
======
06/03
+ * Updated Kafras [Evera]
* Small adjustment to Thanatos Tower spawns [Playtester]
* Fixed some typos and warps in Einbech [Playtester]
* Fixed a small typo in cities/aldebaran.txt thanks to LightFighter [Playtester]
diff --git a/npc/kafras/kafras_com.txt b/npc/kafras/kafras_com.txt
index c317c7728..d0d69b0a2 100644
--- a/npc/kafras/kafras_com.txt
+++ b/npc/kafras/kafras_com.txt
@@ -3,7 +3,7 @@
//===== By: ============================
//= eAthena Dev Team
//===== Current Version: =======================
-//= 2.2
+//= 2.21
//===== Compatible With: ============================
//= eAthena 1.0
//===== Description: ============================================
@@ -19,6 +19,7 @@
//= This version uses arrays .[kobra_k88]
//= Corrected savepoint for in town kafra.[kobra_k88]
//= 2.2 New teleport destinations, prices [Lupus]
+//= 2.21 from Pharos, both warps are now 1200z [Evera]
//=====================================================================
@@ -45,7 +46,7 @@ comodo.gat,200,148,4 script Kafra 721,{
cmd_fild07.gat,135,134,4 script Kafra 721,{
cutin "kafra_07",2;
setarray @wrpD$[0], "Comodo", "Morroc";
- setarray @wrpP[0], 1200, 1800;
+ setarray @wrpP[0], 1200, 1200;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
set @wrpC$[2], "Cancel";
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
index 594b6106f..5d93ae0c4 100644
--- a/npc/kafras/kafras_dungeons.txt
+++ b/npc/kafras/kafras_dungeons.txt
@@ -3,7 +3,7 @@
//===== By: ============================
//= eAthena Dev Team
//===== Current Version: =======================
-//= 2.4
+//= 2.41
//===== Compatible With: ============================
//= eAthena 1.0
//===== Description: ============================================
@@ -22,6 +22,7 @@
//= Fixed Kafras, not giving you Save menu [Lupus]
//= 2.3 Removed SAVE menu from dungeons Kafras [Lupus]
//= 2.4 Now Baby Merchant can pass Merch Job Quest w/o probs [Lupus]
+//= 2.41 Removed useless warp points, already nullified by func call [Evera]
//===============================================================
@@ -106,21 +107,6 @@ gef_fild10.gat,73,340,4 script Kafra 115,{
callfunc "F_KafEnd",0,1;
}
-// Function: Sets variables for Kafras at the Orc Dungeon and the Coal Mines
-function script F_KafSetOrcCoal {
- setarray @wrpD$[0], "Prontera", "Geffen";
- setarray @wrpP[0], 3000, 3000;
- set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
- set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
- set @wrpC$[2], "Cancel";
- set @wrpC$[3], "";
- set @wrpC$[4], "";
- set @wrpC$[5], "";
- set @wrpC$[6], "";
- return;
-}
-
-
//<============================== Treasure Island ==========================>\\
alb2trea.gat,59,69,1 script Kafra 117,{
cutin "kafra_01",2;
diff --git a/npc/kafras/kafras_gef.txt b/npc/kafras/kafras_gef.txt
index afd211a50..b774de7b0 100644
--- a/npc/kafras/kafras_gef.txt
+++ b/npc/kafras/kafras_gef.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= eAthena Dev Team
//===== Current Version: ===================
-//= 2.1b
+//= 2.2
//===== Compatible With: =====================
//= eAthena 1.0
//===== Description: ============================================
@@ -17,6 +17,7 @@
//= v1.1 Now using functions :)
//= v2.1b Minor changes to function calls. Using arguments.
//= This version uses arrays .[kobra_k88]
+//= 2.2 New warps and prices [Evera]
//=====================================================================
@@ -86,8 +87,8 @@ geffen.gat,37,116,6 script Kafra 117,{
// Function: Sets variables for Geffen Kafras -------------------
function script F_KafSetGef {
- setarray @wrpD$[0], "Prontera", "Payon", "Al De Baran", "Morroc";
- setarray @wrpP[0], 1400, 1800, 1800, 2200;
+ setarray @wrpD$[0], "Prontera", "Al De Baran", "Orc Dungeon", "Coal Mine(Dead Pit)";
+ setarray @wrpP[0], 1200, 1200, 1200, 1700;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
diff --git a/npc/kafras/kafras_izl.txt b/npc/kafras/kafras_izl.txt
index 851876856..aac1476ed 100644
--- a/npc/kafras/kafras_izl.txt
+++ b/npc/kafras/kafras_izl.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= eAthena Dev Team
//===== Current Version: ===================
-//= 2.2
+//= 2.21
//===== Compatible With: =====================
//= eAthena 1.0
//===== Description: ============================================
@@ -18,12 +18,13 @@
//= 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]
//=====================================================================
izlude.gat,134,87,3 script Kafra 117,{
cutin "kafra_01",2;
- setarray @wrpD$[0], "Geffen", "Payon", "Morroc", "Al De Baran";
+ setarray @wrpD$[0], "Geffen", "Prontera", "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/kafras/kafras_new.txt b/npc/kafras/kafras_new.txt
index 8ba7af6a1..8af93d882 100644
--- a/npc/kafras/kafras_new.txt
+++ b/npc/kafras/kafras_new.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= eAthena Dev Team
//===== Current Version: ===================
-//= 2.7c
+//= 2.8
//===== Compatible With: =====================
//= eAthena 1.0
//===== Description: ============================================
@@ -26,6 +26,7 @@
//= 2.7 Added the Lighthalzen Kafras [MasterOfMuppets]
//= 2.7b Chanced the Sprite of the Einbech Kafra. [Poki#3]
//= 2.7c Added missing kafra in Lighthalzen, thanks to Muad_Dib [Vicious]
+//= 2.8 Removed warps from Umbala and Gonryun, thanks Drakee [Evera]
//==========================================================================
// Amatsu ------------------------------------------------------------------
@@ -82,8 +83,7 @@ einbroch.gat,59,203,4 script Kafra 117,{
// Gonryun -----------------------------------------------------------------
gonryun.gat,159,122,4 script Kafra 116,{
cutin "kafra_02",2;
- callfunc "F_KafSetYun";
- callfunc "F_Kafra",0,0,1;
+ callfunc "F_Kafra",0,3,1;
M_Save:
savepoint "gonryun.gat",160,62;
@@ -135,8 +135,7 @@ louyang.gat,210,104,5 script Kafra 117,{
// Umbala Kafra ------------------------------------------------------------
umbala.gat,128,133,4 script Kafra 115,{
cutin "kafra_03",2;
- callfunc "F_KafSetYun";
- callfunc "F_Kafra",0,0,1;
+ callfunc "F_Kafra",0,3,1;
M_Save:
savepoint "umbala.gat",126,131;
diff --git a/npc/kafras/kafras_pay.txt b/npc/kafras/kafras_pay.txt
index 4375d0e20..64125c54c 100644
--- a/npc/kafras/kafras_pay.txt
+++ b/npc/kafras/kafras_pay.txt
@@ -3,7 +3,7 @@
//===== By: =========================
//= eAthena Dev Team
//===== Current Version: ===================
-//= 2.3
+//= 2.31
//===== Compatible With: =====================
//= eAthena 1.0
//===== Description: ============================================
@@ -19,6 +19,7 @@
//= This version uses arrays .[kobra_k88]
//= v2.2 New Payon Locations. [Darkchild]
//= 2.3 1 New Kafra, fixed save menus
+//= 2.31 New prices [Evera]
//==========================================================================
@@ -59,7 +60,7 @@ pay_arche.gat,55,123,8 script Kafra 115,{
// Function: Sets variables for Payon Kafras ---------------------------------
function script F_KafSetPay {
setarray @wrpD$[0], "Alberta", "Prontera", "Morroc";
- setarray @wrpP[0], 1200, 1800, 2000;
+ setarray @wrpP[0], 1200, 1200, 1200;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
diff --git a/npc/kafras/kafras_pron.txt b/npc/kafras/kafras_pron.txt
index b35e075f0..03f6672c4 100644
--- a/npc/kafras/kafras_pron.txt
+++ b/npc/kafras/kafras_pron.txt
@@ -21,6 +21,7 @@
//= 2.3 New Teleport list, new prices, 2.3a fixed Alberta Teleport [Lupus]
//= 2.3b One Kafra's been moved to Prontera, thx to Vicious_Pucca [Lupus]
//= 2.4 Updated Kafras locations for the mini-map [Lupus]
+//= 2.41 New prices [Evera]
//=====================================================================
@@ -100,7 +101,7 @@ M_Save:
// Function: Sets variables for Prontera Kafras ----------------------------
function script F_KafSetPront {
setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Alberta";
- setarray @wrpP[0], 600, 1200, 1200, 1200, 1700, 1800;
+ setarray @wrpP[0], 600, 1200, 1200, 1200, 1200, 1800;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
diff --git a/npc/kafras/kafras_yun.txt b/npc/kafras/kafras_yun.txt
index 3116f74ae..c5c68dc49 100644
--- a/npc/kafras/kafras_yun.txt
+++ b/npc/kafras/kafras_yun.txt
@@ -17,6 +17,7 @@
//= v1.1 Now using functions :)
//= v2.1b Minor changes to function calls. Using arguments.
//= This version uses arrays .[kobra_k88]
+//= 2,2 Now only warps to Aldebaran [Evera]
//=====================================================================
@@ -56,15 +57,10 @@ yuno.gat,278,221,6 script Kafra 117,{
// Function: Sets variables for Yuno Kafras ------------
function script F_KafSetYun {
- setarray @wrpD$[0], "Izlude", "Geffen", "Payon", "Morroc", "Orc Dungeon", "Comodo";
- setarray @wrpP[0], 1000, 1400, 1700, 1800, 2500, 3000;
+ setarray @wrpD$[0], "Aldebaran";
+ setarray @wrpP[0], 1200;
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
- set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
- set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];
- set @wrpC$[3], @wrpD$[3]+" -> "+@wrpP[3];
- set @wrpC$[4], @wrpD$[4]+" -> "+@wrpP[4];
- set @wrpC$[5], @wrpD$[5]+" -> "+@wrpP[5];
- set @wrpC$[6], "Cancel";
+ set @wrpC$[1], "Cancel";
setarray @viewpX[0], 328, 278, 153, 0;
setarray @viewpY[0], 108, 221, 187, 0;
return;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-03 20:45:56 +0000