summaryrefslogtreecommitdiff
path: root/npc/kafras
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-28 12:01:19 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-28 12:01:19 +0000
commit27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd (patch)
tree21458ee1dc60d24efcc769a7bbbf76484e46a958 /npc/kafras
parent059cd7894a6908d8329ca4c68791e67d69e241d7 (diff)
downloadhercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.tar.gz
hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.tar.bz2
hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.tar.xz
hercules-27f936fb42e3b6dc9da26dfa2ffdd58e27e012bd.zip
* Fixed Auto Berserk activating by itself when changing maps
* Corrected Yuno warp points * Added Yuno warps to the Aldebaran kafra NPC git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1314 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/kafras')
-rw-r--r--npc/kafras/functions_kafras.txt1
-rw-r--r--npc/kafras/kafras_alde.txt4
2 files changed, 3 insertions, 2 deletions
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index ff4b552ee..5e1c5b6bc 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -165,6 +165,7 @@ function script F_KafTele {
if (@wrpD$[@num] == "Comodo Pharos Lighthouse") warp "cmd_fild07.gat", 127, 134;
if (@wrpD$[@num] == "Orc Dungeon") warp "gef_fild10.gat", 52, 326;
if (@wrpD$[@num] == "Umbala") warp "umbala.gat", 130, 130;
+ if (@wrpD$[@num] == "Yuno") warp "yuno.gat", 157, 123;
close2; // this part safegaurds against errors/typos
set zeny, zeny + @wrpP[@num];
cutin "", 255;
diff --git a/npc/kafras/kafras_alde.txt b/npc/kafras/kafras_alde.txt
index ee2c5f570..ff8a6de6e 100644
--- a/npc/kafras/kafras_alde.txt
+++ b/npc/kafras/kafras_alde.txt
@@ -34,8 +34,8 @@ aldeba_in.gat,96,181,4 script Kafra Leilah 113,{
// South --------------------------------------------------
aldebaran.gat,143,119,4 script Kafra 113,{
cutin "kafra_05",2;
- setarray @wrpP[0], 1600, 2000, 1700, 2200;
- setarray @wrpD$[0], "Geffen", "Payon", "Coal Mine(Dead Pit)", "Comodo";
+ setarray @wrpP[0], 1200, 1200, 1800, 1700;
+ setarray @wrpD$[0], "Geffen", "Yuno" , "Payon", "Coal Mine(Dead Pit)";
set @wrpC$[0], @wrpD$[0]+" -> "+@wrpP[0];
set @wrpC$[1], @wrpD$[1]+" -> "+@wrpP[1];
set @wrpC$[2], @wrpD$[2]+" -> "+@wrpP[2];