* Set 'undead_detect_type' to 0 by default

* Fixed Enchant Poison / Deadly Poison having too high poisoning chance

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

7 files changed, 15 insertions, 8 deletions

diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index 61ac5b655..8d0d39096 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -2,6 +2,8 @@
 Date	Added
 
 03/31
+	* Set 'undead_detect_type' to 0 by default, thanks to Dino9021
+	* Fixed Enchant Poison / Deadly Poison having too high poisoning chance
 	* Reverted the pc_remove_map() change temporarily
 	* Added back up old files in 'save' before saving new data -- also fixes
 	  'Access denied' errors when saving in TXT
diff --git a/conf-tmpl/battle_athena.conf b/conf-tmpl/battle_athena.conf
index a92f27c4e..789346b59 100644
--- a/conf-tmpl/battle_athena.conf
+++ b/conf-tmpl/battle_athena.conf
@@ -438,7 +438,7 @@ save_clothcolor: yes
 // 0 = element undead
 // 1 = race undead
 // 2 = both
-undead_detect_type: 2
+undead_detect_type: 0
 
 // Counter Attack Skill Type
 // 0 = 100% critical
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 9bdf056da..3220f7c14 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,9 @@
 	Einboroch items == 5%
 	Skill databases == celest working on them i believe.
 
+03/31
+	* Updated freeze time for Frost Diver and Frost Nova
+	* Updated cast time for Preserve, thanks to Neko2
 03/29
 	* Some optimizatons, added missing skill to Electric Guitar [Lupus]
 	* Added new items (thanx to Landarma) [Lupus]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index d1b62cf0c..63d4c3ef7 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -10,7 +10,7 @@
 12,4000:3500:3500:2500:2000:1500:1000:1000:1000:1000,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0	//MG_SAFETYWALL#セイフティウォール#
 13,500,1200:1400:1600:1800:2000:2200:2400:2600:2800:2700,0,0	//MG_SOULSTRIKE#ソウルストライク#
 14,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,0,0	//MG_COLDBOLT#コールドボルト#
-15,800,1500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000	//MG_FROSTDIVER#フロストダイバー#
+15,800,1500,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000	//MG_FROSTDIVER#フロストダイバー#
 16,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000	//MG_STONECURSE#ストーンカース#
 17,1600,1600,0,0	//MG_FIREBALL#ファイアーボール#
 18,2000:1850:1700:1550:1400:1250:1100:950:800:650,0,5000:6000:7000:8000:9000:10000:11000:12000:13000:14000,0	//MG_FIREWALL#ファイアーウォール#
@@ -69,7 +69,7 @@
 85,15000:14500:14000:13500:13000:12500:12000:11500:11000:10500,5000,4100,5500:6000:6500:7000:7500:8000:8500:9000:9500:10000	//WZ_VERMILION#ロードオブヴァーミリオン#
 86,1000:2000:3000:4000:5000,0,0,0	//WZ_WATERBALL#ウォーターボール#
 87,0,0,5000:10000:15000:20000:25000:30000:35000:40000:45000:50000,0	//WZ_ICEWALL#アイスウォール#
-88,5000:4700:4400:4100:3800:3500:3200:2900:2700:2500,1000,0,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500	//WZ_FROSTNOVA#フロストノヴァ#
+88,5000:4700:4400:4100:3800:3500:3200:2900:2700:2500,1000,0,1500:3000:4500:6000:7500:9000:10500:12000:13500:15000	//WZ_FROSTNOVA#フロストノヴァ#
 89,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,5000,4600,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000	//WZ_STORMGUST#ストームガスト#
 90,1000:2000:3000:4000:5000,700,0,0	//WZ_EARTHSPIKE#アーススパイク#
 91,1000:2000:3000:4000:5000,700,500,0	//WZ_HEAVENDRIVE#ヘヴンズドライブ#
@@ -268,7 +268,7 @@
 406,0,0,0,3000	//ASC_METEORASSAULT#メテオアサルト#
 407,0,5000,0,0	//ASC_CDP
 
-475,0,0,300000,0	//ST_PRESERVE##
+475,1000,0,600000,0	//ST_PRESERVE##
 476,1000,1000,75000:90000:105000:120000:135000,0	//ST_FULLSTRIP##
 479,2000,0,120000:240000:360000:480000:600000,0	//CR_FULLPROTECTION##
 
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 7b1f98c8f..ef10efd92 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,8 @@ Other Ppl
 Date		Added
 ======
 
+03/31
+	* Corrected a G_GRYPHON spawn in umbala field to GRYPHON, thanks to CrasherZero
 03/29
 	* Corrected Amatsu warp points, thanks to Dino9021
 03/28
diff --git a/npc/mobs/fields/umbala.txt b/npc/mobs/fields/umbala.txt
index c15fec09a..f09b31ead 100644
--- a/npc/mobs/fields/umbala.txt
+++ b/npc/mobs/fields/umbala.txt
@@ -28,7 +28,7 @@ um_fild03.gat,0,0,0,0	monster	Pest	1256,10,0,0,0
 um_fild03.gat,0,0,0,0	monster	Parasite	1500,55,0,0,0
 um_fild03.gat,0,0,0,0	monster	Alligator	1271,30,0,0,0
 um_fild03.gat,0,0,0,0	monster	Dragon Tail	1321,25,0,0,0
-um_fild03.gat,0,0,0,0	monster	Gryphon	1447,1,3600000,3600000,0
+um_fild03.gat,0,0,0,0	monster	Gryphon	1259,1,3600000,3600000,0
 
 //(um_fild04.gat)*
 um_fild04.gat,0,0,0,0	monster	Stainer	1174,30,0,0,0
diff --git a/src/map/skill.c b/src/map/skill.c
index 0ea0c81fa..d84a18d7a 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -772,13 +772,13 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
 			}
 			// enchant poison has a chance of poisoning enemy
 			if (sd->sc_data[SC_ENCPOISON].timer != -1 && sc_data && sc_data[SC_POISON].timer == -1 &&
-				rand() % 100 < sd->sc_data[SC_ENCPOISON].val1 * sc_def_vit) {
+				rand() % 100 < sd->sc_data[SC_ENCPOISON].val1 * sc_def_vit / 100) {
 				status_change_start(bl,SC_POISON,sd->sc_data[SC_ENCPOISON].val1,
 					0,0,0,skill_get_time2(AS_ENCHANTPOISON,sd->sc_data[SC_ENCPOISON].val1),0);
 			}
 			// エンチャントデットリ?ポイズン(猛毒?果)
 			if (sd->sc_data[SC_EDP].timer != -1 && sc_data && sc_data[SC_DPOISON].timer == -1 &&
-				rand() % 100 < sd->sc_data[SC_EDP].val2 * sc_def_vit)
+				rand() % 100 < sd->sc_data[SC_EDP].val2 * sc_def_vit / 100)
 				status_change_start(bl,SC_DPOISON,sd->sc_data[SC_EDP].val1,
 					0,0,0,skill_get_time2(ASC_EDP,sd->sc_data[SC_EDP].val1),0);			
 		}
@@ -6791,7 +6791,7 @@ int skill_delayfix( struct block_list *bl, int time )
 	sc_data = status_get_sc_data(bl);
 
 	if(sd) {
-		delayrate=((struct map_session_data *)bl)->delayrate;
+		delayrate = sd->delayrate;
 
 		// instant cast attack skills depend on aspd as delay [celest]
 		if (time == 0) {