- Corrected char-server parameters so that the subnet config file is the third parameter, not the second (which was conflicting with inter_athena.conf's argument), thanks to foobar.

- Fixed TK and Soul Linker's position of their job entry in exp2.txt, thanks to Coltaro.
- Fixed NPC_GRANDDARKNESS targetting the enemy instead of yourself in mob_skill_db.
- Fixed Grandcross's hit and range entries in the skill_db (it had hit 5? that wasn't even a valid value from the description)
- PR_BENEDICTIO now ignores mdef
- Removed the status_isdead checks from status_check_skilluse, they are now done only on the skill_castend_* functions.
- Fixed NPC_SELFDESTRUCTION not doing the correct damage to oneself.
- Fixed chatlog's x/y column capacity.


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

Changelog-Trunk.txt

@@ -4,7 +4,12 @@ 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.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
-
+2006/03/13
+	* Corrected char-server parameters so that the subnet config file is the
+	  third parameter, not the second (which was conflicting with
+	  inter_athena.conf's argument), thanks to foobar. [Skotlex]
+	* PR_BENEDICTIO now ignores mdef [Skotlex]
+	* Fixed chatlog's x/y column capacity in sql-files/logs.sql [Skotlex]
 2006/03/12
 	* Updated clone skill copy to consider combo-skills. [Skotlex]
 	* no_spawn_on_player won't work on mobs with no respawn delays now. [Skotlex]

db/Changelog.txt

@@ -25,7 +25,13 @@
 	-----
 
 =========================
-
+03/13
+	* Fixed TK and Soul Linker's position of their job entry in exp2.txt,
+	  thanks to Coltaro. [Skotlex]
+	* Fixed NPC_GRANDDARKNESS targetting the enemy instead of yourself in
+	  mob_skill_db. [Skotlex]
+	* Fixed Grandcross's hit and range entries in the skill_db (it had hit 5?
+	  that wasn't even a valid value from the description) [Skotlex]
 03/11
 	* Update the buy/sell prices of four daggers(1247-1249 & 13000) [MasterOfMuppets]
 	* Adjusted bonus items drop rates at Mimic Card and Myst Case Card [Lupus]

db/mob_skill_db.txt

@@ -1613,7 +1613,7 @@
 1373,Lord of Death@NPC_CHANGEUNDEAD,attack,348,1,2000,0,5000,no,self,always,0,,,,,,
 1373,Lord of Death@NPC_DARKSTRIKE,chase,340,10,10000,0,5000,yes,target,skillused,18,,,,,,
 1373,Lord of Death@NPC_DARKSTRIKE,chase,340,10,200,0,5000,yes,target,always,0,,,,,,
-1373,Lord of Death@NPC_GRANDDARKNESS,attack,339,10,1000,700,5000,no,target,myhpltmaxrate,30,,,,,,
+1373,Lord of Death@NPC_GRANDDARKNESS,attack,339,10,1000,700,5000,no,self,myhpltmaxrate,30,,,,,,
 1373,Lord of Death@NPC_STUNATTACK,attack,179,5,2000,0,0,no,target,always,0,,,,,,
 1373,Lord of Death@NPC_SUMMONSLAVE,attack,196,5,10000,700,10000,no,self,slavele,3,1490,1490,1509,1508,1179,
 1373,Lord of Death@NPC_SUMMONSLAVE,idle,196,5,10000,700,10000,no,self,slavele,3,1490,1490,1509,1508,1179,
@@ -2632,8 +2632,8 @@
 1626,Dark Priest@NPC_DARKCROSS,attack,338,10,5000,0,10000,yes,target,always,0,,,,,,9
 1626,Dark Priest@NPC_DARKNESSATTACK,attack,190,5,500,500,5000,yes,target,always,0,,,,,,
 1626,Dark Priest@NPC_DARKSTRIKE,chase,340,10,200,700,5000,yes,target,always,0,,,,,,9
-1626,Dark Priest@NPC_GRANDDARKNESS,attack,339,5,2000,2000,30000,no,target,attackpcgt,2,,,,,,9
-1626,Dark Priest@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,target,attackpcgt,2,,,,,,9
+1626,Dark Priest@NPC_GRANDDARKNESS,attack,339,5,2000,2000,30000,no,self,attackpcgt,2,,,,,,9
+1626,Dark Priest@NPC_GRANDDARKNESS,attack,339,5,500,2000,30000,no,self,attackpcgt,2,,,,,,9
 1627,Virus@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,30
 1627,Virus@NPC_BLOODDRAIN,chase,199,1,50,0,5000,yes,target,always,0,,,,,,30
 1627,Virus@NPC_COMBOATTACK,attack,171,2,500,700,5000,no,target,always,0,,,,,,
@@ -3433,7 +3433,7 @@
 1701,Shelter@NPC_BLINDATTACK,angry,177,3,500,0,5000,yes,target,always,0,,,,,,
 1701,Shelter@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,
 1701,Shelter@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
-1702,Retribution@NPC_GRANDDARKNESS,attack,339,1,2000,0,0,yes,target,always,0,,,,,,
+1702,Retribution@NPC_GRANDDARKNESS,attack,339,1,2000,0,0,yes,self,always,0,,,,,,
 1702,Retribution@NPC_DARKCROSS,attack,338,5,500,1500,5000,no,target,always,0,,,,,,
 1702,Retribution@NPC_DARKNESSATTACK,attack,190,3,500,0,5000,yes,target,always,0,,,,,,
 1702,Retribution@NPC_DARKBREATH,attack,202,2,500,800,5000,no,target,always,0,,,,,,

db/skill_db.txt

@@ -273,7 +273,7 @@
 251,3:5:7:9:11,6,1,0,0,0,5,1,no,0,0,0,weapon,0	//CR_SHIELDBOOMERANG#Shield Boomerang#
 252,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0	//CR_REFLECTSHIELD#Shield Reflect#
 253,-2,8,1,6,0,0,10,-2,no,0,0,0,weapon,0	//CR_HOLYCROSS#Holy Cross#
-254,9,5,4,6,0,0,10,1,no,33,256,0,magic,0	//CR_GRANDCROSS#Grand Cross#
+254,0,6,4,6,0,0,10,1,no,33,256,0,magic,0	//CR_GRANDCROSS#Grand Cross#
 255,7:8:9:10:11,6,16,0,1,0,5,1,yes,0,3584,0,none,0	//CR_DEVOTION#Sacrifice#
 256,9,6,16,0,1,0,5,1,yes,0,512,0,none,0	//CR_PROVIDENCE#Resistant Souls#
 257,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0	//CR_DEFENDER#Defending Aura#

sql-files/logs.sql

@@ -214,8 +214,8 @@ CREATE TABLE `chatlog` (
   `src_charid` int(11) NOT NULL default '0',
   `src_accountid` int(11) NOT NULL default '0',
   `src_map` varchar(17) NOT NULL default 'prontera.gat',
-  `src_map_x` tinyint(4) NOT NULL default '0',
-  `src_map_y` tinyint(4) NOT NULL default '0',
+  `src_map_x` smallint(4) NOT NULL default '0',
+  `src_map_y` smallint(4) NOT NULL default '0',
   `dst_charname` varchar(25) NOT NULL default '',
   `message` varchar(150) NOT NULL default '',
   PRIMARY KEY  (`id`)

src/char/char.c

@@ -4089,7 +4089,7 @@ int do_init(int argc, char **argv) {
 	mapindex_init(); //Needed here for the start-point reading.
 	start_point.map = mapindex_name2id("new_1-1.gat");
 	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
-	char_lan_config_read((argc > 1) ? argv[1] : LOGIN_LAN_CONF_NAME);
+	char_lan_config_read((argc > 3) ? argv[3] : LOGIN_LAN_CONF_NAME);
 
 	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
 		ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");

src/char_sql/char.c

@@ -4109,7 +4109,7 @@ int do_init(int argc, char **argv){
 	start_point.map = mapindex_name2id("new_1-1.gat");
 	
 	char_config_read((argc < 2) ? CHAR_CONF_NAME : argv[1]);
-	char_lan_config_read((argc > 1) ? argv[1] : LAN_CONF_NAME);
+	char_lan_config_read((argc > 3) ? argv[3] : LAN_CONF_NAME);
 	sql_config_read(SQL_CONF_NAME);
 
 	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {

src/map/battle.c

@@ -2527,6 +2527,7 @@ struct Damage battle_calc_magic_attack(
 		case PR_SANCTUARY:
 			ad.blewcount|=0x10000;
 		case AL_HEAL:
+		case PR_BENEDICTIO:
 		case WZ_FIREPILLAR:
 			flag.imdef = 1;
 			break;

src/map/skill.c

@@ -4097,7 +4097,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			skill_get_splash(skillid, skilllv), BL_CHAR,
 			src, skillid, skilllv, tick, flag|BCT_ENEMY,
 			skill_castend_damage_id);
-		battle_damage(src, src, skill_area_temp[2], 0);
+		battle_damage(src, src, status_get_max_hp(src), 0);
 		break;
 
 	/* ƒp?ƒeƒBƒXƒLƒ‹ */
@@ -5978,6 +5978,9 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil
 
 	nullpo_retr(0, src);
 
+	if(status_isdead(src))
+		return 0;
+
 	if(src->type==BL_PC)
 		sd=(struct map_session_data *)src;
 

src/map/status.c

@@ -354,11 +354,6 @@ int status_check_skilluse(struct block_list *src, struct block_list *target, int
 	int mode, race, hide_flag;
 	struct status_change *sc=NULL, *tsc;
 
-	if (src && status_isdead(src))
-		return 0;
-	if (target && status_isdead(target) && skill_num != ALL_RESURRECTION && skill_num != PR_REDEMPTIO)
-		return 0;
-	
 	mode = src?status_get_mode(src):MD_CANATTACK;
 	
 	if (!skill_num && !(mode&MD_CANATTACK))