- Updated skill_require_db's entry for Abracadabra, it requires yellow 2 gemstones (there's no such hardcoded yellow gemstone requirement anymore)

- Corrected db/const.txt entry bMagicSubRace -> bMagicAddSize
- Fixed Aex Aeterna ending on Soul Breaker's first half.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8651 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,11 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/09/06
+	* Updated skill_require_db's entry for Abracadabra, it requires yellow 2
+	  gemstones (there's no such hardcoded yellow gemstone requirement anymore)
+	  [Skotlex]
+	* Corrected db/const.txt entry bMagicSubRace -> bMagicAddSize [Skotlex]
+	* Fixed Aex Aeterna ending on Soul Breaker's first half. [Skotlex]
 	* Applied Orn's modification on speed increases/reductions with increase/
 	decrease agi [Toms] 
 2006/09/05

db/const.txt

@@ -310,7 +310,7 @@ bIgnoreMdefEle	1033
 bIgnoreMdefRace	1034
 bMagicAddEle	1035
 bMagicAddRace	1036
-bMagicSubRace	1037
+bMagicAddSize	1037
 bPerfectHitRate	1038
 bPerfectHitAddRate	1039
 bCriticalRate	1040

db/skill_require_db.txt

@@ -216,8 +216,7 @@
 287,0,0,48:46:44:42:40,0,0,0,99,0,0,none,0,715,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_VIOLENTGALE#バイオレントゲイル#
 288,0,0,66:62:58:54:50,0,0,0,99,0,0,none,0,717,1,715,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_LANDPROTECTOR#ランドプロテクタ?#
 289,0,0,1,0,0,0,99,0,0,none,0,715,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_DISPELL#ディスペル#
-290,0,0,50,0,0,0,99,0,0,none,0,715,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_ABRACADABRA#アブラカタブラ#
-//reduced 2 to 1 Yellow gemstones, because Abrakadabra has extra hardcoded usage of 1 Yellow gemstone [Lupus]
+290,0,0,50,0,0,0,99,0,0,none,0,715,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_ABRACADABRA#アブラカタブラ#
 291,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_MONOCELL#チェンジポリン#
 292,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_CLASSCHANGE#クラスチェンジ#
 293,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SA_SUMMONMONSTER#サモンモンスタ?#

src/common/socket.c

@@ -1395,7 +1395,7 @@ bool session_isActive(int fd)
 in_addr_t resolve_hostbyname(char* hostname, unsigned char *ip, char *ip_str) {
 	struct hostent *h = gethostbyname(hostname);
 	unsigned char ip_buf[16];
-	char ip2[4];
+	unsigned char ip2[4];
 	if (!h) return 0;
 	if (ip == NULL) ip = ip2;
 	ip[0] = (unsigned char) h->h_addr[0];

src/map/battle.c

@@ -331,7 +331,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i
 		if(sc->data[SC_AETERNA].timer!=-1 && skill_num != PF_SOULBURN){
 			damage<<=1;
 			//Shouldn't end until Breaker's non-weapon part connects.
-			if (skill_num != ASC_BREAKER || flag&BF_WEAPON)
+			if (skill_num != ASC_BREAKER || !(flag&BF_WEAPON))
 				status_change_end( bl,SC_AETERNA,-1 );
 		}