* 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

7 files changed, 12 insertions, 5 deletions

diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 10a648ab4..71262554f 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,6 +1,7 @@
 Date	Added
 
 03/28
+	* Fixed Auto Berserk activating by itself when changing maps [celest]
 	* Re-fixed the SQL syntax crash in logging [celest]
 
 03/27
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ab5d7f20a..959879146 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,10 @@ Other Ppl
 Date		Added
 ======
 
+03/28
+	* Corrected Yuno warp points, thanks to Dino9021
+	* Added Yuno warps to the Aldebaran kafra NPC, thanks to Dino9021
+
 03/27
 	* Fixed Ant Hell warps, thanks to Dino9021
 	* Corrected positions for Thief and Archer quest skills NPCs, thanks to Dino9021
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];
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 9232e7f88..402e506f7 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -13,7 +13,7 @@
 //============================================================
 
 //= Yuno City ================================================
-yuno.gat,158,15,0	warp	yun-yunfild	1,1,yuno_fild04.gat,231,209
+yuno.gat,158,15,0	warp	yun-yunfild	1,1,yuno_fild04.gat,231,284
 yuno.gat,117,135,0	warp	yun01	1,1,yuno_in01.gat,116,37
 yuno_in01.gat,116,40,0	warp	yun02	1,1,yuno.gat,120,138
 yuno.gat,48,105,0	warp	yun03	1,1,yuno_in01.gat,37,176
diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt
index e1a5253d6..1948d6d17 100644
--- a/npc/warps/fields/yuno_fild.txt
+++ b/npc/warps/fields/yuno_fild.txt
@@ -24,7 +24,7 @@ yuno_fild03.gat,19,79,0	warp	yunfild04	1,1,yuno_fild04.gat,373,84
 yuno_fild04.gat,375,84,0	warp	yunfild04-1	1,1,yuno_fild03.gat,21,79
 yuno_fild03.gat,20,155,0	warp	yunfild05	1,1,yuno_fild04.gat,373,150
 yuno_fild04.gat,375,150,0	warp	yunfild05-1	1,1,yuno_fild03.gat,22,155
-yuno_fild04.gat,231,211,0	warp	yunfild-yun	1,1,yuno.gat,158,17
+yuno_fild04.gat,231,288,0	warp	yunfild-yun	1,1,yuno.gat,158,17
 yuno_fild03.gat,32,139,0	warp	yunfild-mag01	1,1,mag_dun01.gat,126,68
 
 //= New Yuno Fields ==========================================
diff --git a/src/map/clif.c b/src/map/clif.c
index d9665b527..a3dea154f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7579,7 +7579,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 	if(battle_config.save_clothcolor==1 && sd->status.clothes_color > 0)
 		clif_changelook(&sd->bl,LOOK_CLOTHES_COLOR,sd->status.clothes_color);
 
-	if(sd->status.hp<sd->status.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 &&
+	//if(sd->status.hp<sd->status.max_hp>>2 && pc_checkskill(sd,SM_AUTOBERSERK)>0 &&
+	if(sd->status.hp<sd->status.max_hp>>2 && sd->sc_data[SC_AUTOBERSERK].timer != -1 &&
 		(sd->sc_data[SC_PROVOKE].timer==-1 || sd->sc_data[SC_PROVOKE].val2==0 ))
 		// オートバーサーク発動
 		status_change_start(&sd->bl,SC_PROVOKE,10,1,0,0,0,0);