* Minor change in payon.txt to prevent crash : rand(0) -> 0

* Removed Berserk's skills requirements

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1403 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 10 insertions, 7 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 5c2f182df..072d5dcf7 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -9,6 +9,7 @@
 	Skill databases == celest working on them i believe.
 
 04/04
+	* Removed required skills for Berserk (only job level 50 is needed) [DracoRPG]
 	* Re-added MDEF +15 to Resting Cat [DracoRPG]
 	* Added Sunglasses & Glasses into OBB, added slotted Sunglasses & Glasses into OVB [Lupus]
 04/03
diff --git a/db/skill_tree.txt b/db/skill_tree.txt
index c78aef459..70d2b2e1d 100644
--- a/db/skill_tree.txt
+++ b/db/skill_tree.txt
@@ -445,7 +445,7 @@
 18,235,5,237,3,0,0,0,0,0,0,0,0//AM_CP_SHIELD	#ケミカルシールドチャージ#
 18,236,5,235,3,0,0,0,0,0,0,0,0//AM_CP_ARMOR	#ケミカルアーマーチャージ#
 18,237,5,228,2,0,0,0,0,0,0,0,0//AM_CP_HELM	#ケミカルヘルムチャージ#
-// 韓国でも未実装なので以下のツリーコメントアウト
+// Homonculus skill tree (disabled as for now)
 //18,238,1,0,0,0,0,0,0,0,0,0,0//AM_BIOETHICS		#生命倫理#
 //18,239,10,238,1,0,0,0,0,0,0,0,0//AM_BIOTECHNOLOGY	#生命工学研究#
 //18,240,5,239,7,0,0,0,0,0,0,0,0//AM_CREATECREATURE	#被造物創造#
@@ -719,7 +719,7 @@
 4008,356,10,3,10,6,5,60,3,0,0,0,0//LK_PARRYING
 4008,357,5,4,1,55,5,63,1,0,0,0,0//LK_CONCENTRATE
 4008,358,1,4,10,6,5,8,3,0,0,0,0//LK_TENSIONRELAX
-4008,359,1,50,55,7,56,5,57,5,58,2,63,1//LK_BERSERK
+4008,359,1,50,0,0,0,0,0,0,0,0,0,0//LK_BERSERK
 4008,398,5,55,9,63,1,0,0,0,0,0,0//LK_HEADCRUSH
 4008,399,10,55,9,64,3,398,3,0,0,0,0//LK_JOINTBEAT#ジョイントビート#
 //High Priest
@@ -923,7 +923,7 @@
 4014,356,10,3,10,6,5,60,3,0,0,0,0//LK_PARRYING
 4014,357,5,4,1,55,5,63,1,0,0,0,0//LK_CONCENTRATE
 4014,358,1,4,10,6,5,8,3,0,0,0,0//LK_TENSIONRELAX
-4014,359,1,55,7,56,5,57,5,58,2,63,1//LK_BERSERK
+4008,359,1,50,0,0,0,0,0,0,0,0,0,0//LK_BERSERK
 //4014,360,1,3,10,4,6,62,6,0,0,0,0//LK_FURY
 4014,397,5,55,10,56,10,58,5,63,1,0,0//LK_SPIRALPIERCE
 4014,398,5,55,9,63,1,0,0,0,0,0,0//LK_HEADCRUSH
@@ -1107,7 +1107,7 @@
 4019,235,5,237,3,0,0,0,0,0,0,0,0//AM_CP_SHIELD	#ケミカルシールドチャージ#
 4019,236,5,235,3,0,0,0,0,0,0,0,0//AM_CP_ARMOR	#ケミカルアーマーチャージ#
 4019,237,5,228,2,0,0,0,0,0,0,0,0//AM_CP_HELM	#ケミカルヘルムチャージ#
-// 韓国でも未実装なので以下のツリーコメントアウト
+// Homonculus skill tree (disabled as for now)
 //4019,238,1,0,0,0,0,0,0,0,0,0,0//AM_BIOETHICS		#生命倫理#
 //4019,239,10,238,1,0,0,0,0,0,0,0,0//AM_BIOTECHNOLOGY	#生命工学研究#
 //4019,240,5,239,7,0,0,0,0,0,0,0,0//AM_CREATECREATURE	#被造物創造#
@@ -1667,7 +1667,7 @@
 4041,235,5,237,3,0,0,0,0,0,0,0,0//AM_CP_SHIELD	#ケミカルシールドチャージ#
 4041,236,5,235,3,0,0,0,0,0,0,0,0//AM_CP_ARMOR	#ケミカルアーマーチャージ#
 4041,237,5,228,2,0,0,0,0,0,0,0,0//AM_CP_HELM	#ケミカルヘルムチャージ#
-// 韓国でも未実装なので以下のツリーコメントアウト
+// Homonculus skill tree (disabled as for now)
 //4041,238,1,0,0,0,0,0,0,0,0,0,0//AM_BIOETHICS		#生命倫理#
 //4041,239,10,238,1,0,0,0,0,0,0,0,0//AM_BIOTECHNOLOGY	#生命工学研究#
 //4041,240,5,239,7,0,0,0,0,0,0,0,0//AM_CREATECREATURE	#被造物創造#
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b276dcdaa..24dd6ffac 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -34,6 +34,8 @@ Date		Added
 ======
 
 04/04
+	* Changed "set @TEMP,rand(0);" to set "@TEMP,0;" in the Payon Fortune Teller script [DracoRPG]
+	  We'll have to get all the fortunes, but they are more than 200...
 	* Finished Payon's Gemstone Exchanger, thanks to Dino9021 [DracoRPG]
 	* Added Deviling in the "Poring Island" map pay_fild04, 2 hours respawn [Lupus]
 04/03
diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt
index 9743df30c..1a465376a 100644
--- a/npc/cities/payon.txt
+++ b/npc/cities/payon.txt
@@ -951,7 +951,7 @@ payon_in03.gat,117,128,4	script	Fortune Teller	704,{
 	mes "[Lhimetorra]";
 	mes "Future... the card that sees the future is beginning to speak...... Prepare yourself...";
 	next;
-	set @TEMP,rand(0);
+	set @TEMP,0;
 	mes "[Lhimetorra]";
 	if(@TEMP == 0) mes "Jack says you may be frustrated in the future.";
 	if(@TEMP == 0) mes "He says to overcome the frustration, it is necessary to think of happy thoughts.";
@@ -973,7 +973,7 @@ payon_in03.gat,117,128,4	script	Fortune Teller	704,{
 	mes "form of cards... so listen";
 	mes "carefully-!";
 	next;
-	set @TEMP,rand(0);
+	set @TEMP,0;
 	mes "[Lhimetorra]";
 	if(@TEMP == 0) mes "The pirate is warning you of your beauty. Don't show off your beauty too much. Pirates are very jealous of aparence, as well.";
 	next;