Random assortment of various small corrections and tweaks.

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

conf/mapflag/jail.txt

@@ -36,7 +36,7 @@ sec_pri	mapflag	nowarp
 sec_pri	mapflag	noreturn
 
 // Bloody Jail ===========================
-//Uncomment following maps to let your prisoners fight with other prisoners
+//Uncomment following mapflags to let your prisoners fight with other prisoners
 
 // PvP ===================================
 sec_pri	mapflag	pvp

conf/mapflag/nomemo.txt

@@ -231,14 +231,14 @@ alde_dun01	mapflag	nomemo
 alde_dun02	mapflag	nomemo
 alde_dun03	mapflag	nomemo
 alde_dun04	mapflag	nomemo
-// Anthelll ------------------
+// Anthell -------------------
 anthell01	mapflag	nomemo
 anthell02	mapflag	nomemo
 // Amatsu Dungeon ------------
 ama_dun01	mapflag	nomemo
 ama_dun02	mapflag	nomemo
 ama_dun03	mapflag	nomemo
-// Ayothaya
+// Ayothaya ------------------
 ayo_dun01	mapflag	nomemo
 ayo_dun02	mapflag	nomemo
 // Comodo Beach --------------
@@ -307,7 +307,7 @@ moc_pryd04	mapflag	nomemo
 moc_pryd05	mapflag	nomemo
 moc_pryd06	mapflag	nomemo
 moc_prydb1	mapflag	nomemo
-// Coal Mine(Dead Pitt) ------
+// Coal Mine (Dead Pit) ------
 mjo_dun01	mapflag	nomemo
 mjo_dun02	mapflag	nomemo
 mjo_dun03	mapflag	nomemo

conf/mapflag/nopvp.txt

@@ -1,4 +1,4 @@
-///===== Description: =============================================
+//===== Description: =========================================
 //= pvp	off: Disables Player versus Player mode.
 //= To disable PvP mode on a specific map add the mapname here.
 //= v 1.1a

db/item_db.txt

@@ -617,7 +617,7 @@
 1268,Wild_Beast_Claw,Wilf Beast Claw,4,,10,1450,160,,1,1,0x00001000,2,2,34,4,55,1,16,{ if(getrefine() >= 9){ bonus3 bAutoSpell,"NPC_CRITICALWOUND",2,100; } else bonus3 bAutoSpell,"NPC_CRITICALWOUND",1,100; },{},{}
 1269,Inverse_Scale,Inverse Scale,4,,10,1500,140,,1,0,0x00001000,2,2,34,4,55,1,16,{ bonus bAtkEle,Ele_Holy; bonus3 bAutoSpell,"NPC_DRAGONFEAR",1,30; },{},{}
 1270,Drill_Katar,Drill Katar,4,,10,1400,110,,1,1,0x00001000,2,2,34,4,55,1,16,{ bonus bHit,30; bonus3 bAutoSpell,"ST_FULLSTRIP",1,150; },{},{}
-1271,Blood_Tears,Blood Tears,4,,10,1700,120,,1,2,0x00001000,2,2,34,4,55,1,16,{ if(getrefine() >= 9){ bonus3 bAutoSpell,665,2,30; } else bonus3 bAutoSpell,"NPC_WIDEBLEEDING",1,30; },{},{}
+1271,Blood_Tears,Blood Tears,4,,10,1700,120,,1,2,0x00001000,2,2,34,4,55,1,16,{ if(getrefine() >= 9){ bonus3 bAutoSpell,"NPC_WIDEBLEEDING",2,30; } else bonus3 bAutoSpell,"NPC_WIDEBLEEDING",1,30; },{},{}
 1272,Scratcher,Scratcher,4,,10,0,120,,1,0,0x00001000,7,2,34,1,1,0,16,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
 1273,Bloody_Roar_C,Refined Bloody Roar,4,,0,0,148,,1,0,0x00001000,7,2,34,4,1,0,16,{ bonus bIgnoreDefRace,RC_DemiHuman; bonus bFlee,-160; bonus bFlee2,-160; },{},{}
 1274,Unholy_Touch_C,Refined Unholy Touch,4,,0,0,179,,1,0,0x00001000,7,2,34,4,1,0,16,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Curse,500; bonus bCritical,-1; bonus bUnbreakableWeapon,0; },{},{}

npc/quests/quests_hugel.txt

@@ -2799,7 +2799,7 @@ hu_in01,256,40,3	script	Herico	897,{
 		mes "They have become too powerful to just be considered a big corporation.";
 		next;
 		mes "["+strcharinfo(0)+"]";
-		mes "That was why they found the \"Bio Lab\"";
+		mes "That was why they founded the \"Bio Lab\"";
 		mes "in order to continue with their research without Sage Varmunt.";
 		next;
 		cutin "heri3.bmp",2;
@@ -3501,7 +3501,7 @@ hu_in01,317,312,0	script	Book	111,{
 					next;
 					mes "Date: **month **day";
 					mes "I was told that Rekenber succeeded";
-					mes "in creating a type of machine called ^FF000000Guardian^000000.";
+					mes "in creating a type of machine called ^FF0000Guardian^000000.";
 					mes "I have a bad feeling about that, so I decided to write a journal";
 					mes "starting from today and keep everything in record.";
 					mes "¡¡";

npc/quests/quests_lighthalzen.txt

@@ -5869,7 +5869,7 @@ lhz_in01,286,226,3	script	Secretary Slierre	831,{
 				mes "experiment. And of course, he";
 				mes "should only be testing on animals.";
 				next;
-				switch( select( "Wolfchev's research is great!","His experiments are suspicius..." ) )
+				switch( select( "Wolfchev's research is great!","His experiments are suspicious..." ) )
 				{		
 					case 1:
 						mes "[Sueii Slierre]";
@@ -7884,7 +7884,7 @@ L_Mission:
 			mes "[Karl]";
 			mes "We've recently learned that";
 			mes "Shinokas managed to access";
-			mes "the Regenschirm  Secret Archive, a lab affiliated with Rekenber.";
+			mes "the Regenschirm Secret Archive, a lab affiliated with Rekenber.";
 			mes "That's how Shinokas was able";
 			mes "to learn so much about them.";
 			next;
@@ -9324,7 +9324,7 @@ lhz_in01,285,169,3	script	Researcher#2	865,{
 		mes "is being monitored, I can't";
 		mes "risk going inside there. You";
 		mes "need to sneak in on your own";
-		mes "when the guards change shifts.It's an old trick, but it works.";
+		mes "when the guards change shifts. It's an old trick, but it works.";
 		next;
 		mes "[Lestin]";
 		mes "My pass will get you inside,";

npc/quests/quests_rachel.txt

@@ -6224,7 +6224,7 @@ ra_temin,170,46,3	script	Panno#rachel	920,{
 		mes "be a shelter from intruders.";
 		next;
 		mes "[Priestess Panno]";
-		mes "My ancester designed the";
+		mes "My ancestor designed the";
 		mes "temple security system to";
 		mes "require a special permit in";
 		mes "order to access the temple";

src/char_sql/int_auction.c

@@ -12,6 +12,7 @@
 #include "char.h"
 #include "inter.h"
 #include "int_mail.h"
+#include "int_auction.h"
 
 #include <stdio.h>
 #include <string.h>

src/map/chrif.c

@@ -17,6 +17,7 @@
 #include "npc.h"
 #include "pc.h"
 #include "pet.h"
+#include "skill.h"
 #include "status.h"
 #include "mercenary.h"
 #include "chrif.h"
@@ -910,18 +911,18 @@ int chrif_deadopt(int father_id, int mother_id, int child_id)
 	if( father_id && (sd = map_charid2sd(father_id)) != NULL && sd->status.child == child_id )
 	{
 		sd->status.child = 0;
-		sd->status.skill[410].id = 0;
-		sd->status.skill[410].lv = 0;
-		sd->status.skill[410].flag = 0;
+		sd->status.skill[WE_CALLBABY].id = 0;
+		sd->status.skill[WE_CALLBABY].lv = 0;
+		sd->status.skill[WE_CALLBABY].flag = 0;
 		clif_skillinfoblock(sd);
 	}
 
 	if( mother_id && (sd = map_charid2sd(mother_id)) != NULL && sd->status.child == child_id )
 	{
 		sd->status.child = 0;
-		sd->status.skill[410].id = 0;
-		sd->status.skill[410].lv = 0;
-		sd->status.skill[410].flag = 0;
+		sd->status.skill[WE_CALLBABY].id = 0;
+		sd->status.skill[WE_CALLBABY].lv = 0;
+		sd->status.skill[WE_CALLBABY].flag = 0;
 		clif_skillinfoblock(sd);
 	}
 

src/map/clif.c

@@ -7060,9 +7060,9 @@ int clif_refresh(struct map_session_data *sd)
 	map_foreachinrange(clif_getareachar,&sd->bl,AREA_SIZE,BL_ALL,sd);
 	clif_weather_check(sd);
 	if( pc_issit(sd) )
-		clif_sitting(&sd->bl);
+		clif_sitting(&sd->bl); // FIXME: just send to self, not area
 	if( pc_isdead(sd) ) //When you refresh, resend the death packet.
-		clif_clearunit_area(&sd->bl,1);
+		clif_clearunit_single(sd->bl.id,1,sd->fd);
 
 #ifndef TXT_ONLY
 	mail_clear(sd);

src/map/clif.h

@@ -175,7 +175,6 @@ void clif_talkiebox(struct block_list* bl, const char* talkie);
 void clif_wedding_effect(struct block_list *bl);
 void clif_divorced(struct map_session_data* sd, const char* name);
 //void clif_callpartner(struct map_session_data *sd);
-void clif_adopt_process(struct map_session_data *sd);
 void clif_soundeffect(struct map_session_data* sd, struct block_list* bl, const char* name, int type);
 int clif_soundeffectall(struct block_list* bl, const char *name, int type, enum send_target coverage);
 void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, int target_id, unsigned int tick);

src/map/npc.c

@@ -2060,16 +2060,16 @@ void npc_setcells(struct npc_data* nd)
 
 	switch(nd->subtype)
 	{
-		case WARP:
-			xs = nd->u.warp.xs;
-			ys = nd->u.warp.ys;
-			break;
-		case SCRIPT:
-			xs = nd->u.scr.xs;
-			ys = nd->u.scr.ys;
-			break;
-                default:
-			return; // Other types doesn't have touch area
+	case WARP:
+		xs = nd->u.warp.xs;
+		ys = nd->u.warp.ys;
+		break;
+	case SCRIPT:
+		xs = nd->u.scr.xs;
+		ys = nd->u.scr.ys;
+		break;
+	default:
+		return; // Other types doesn't have touch area
 	}
 
 	if (m < 0 || xs < 0 || ys < 0)
@@ -2896,7 +2896,7 @@ int npc_reload(void)
 		"\t-'"CL_WHITE"%d"CL_RESET"' Warps\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Scripts\n"
-		"\t-'"CL_WHITE"%d"CL_RESET"' Mob sets\n"
+		"\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",
 		npc_id - npc_new_min, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob);
@@ -3007,7 +3007,7 @@ int do_init_npc(void)
 		"\t-'"CL_WHITE"%d"CL_RESET"' Warps\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Shops\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Scripts\n"
-		"\t-'"CL_WHITE"%d"CL_RESET"' Mob sets\n"
+		"\t-'"CL_WHITE"%d"CL_RESET"' Spawn sets\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Mobs Cached\n"
 		"\t-'"CL_WHITE"%d"CL_RESET"' Mobs Not Cached\n",
 		npc_id - START_NPC_NUM, npc_warp, npc_shop, npc_script, npc_mob, npc_cache_mob, npc_delay_mob);

src/map/script.c

@@ -4312,8 +4312,7 @@ BUILDIN_FUNC(areawarp)
 	else if(!(index=mapindex_name2id(str)))
 		return 0;
 
-	map_foreachinarea(buildin_areawarp_sub,
-		m,x0,y0,x1,y1,BL_PC,	index,x,y );
+	map_foreachinarea(buildin_areawarp_sub, m,x0,y0,x1,y1,BL_PC, index,x,y);
 	return 0;
 }
 
@@ -7558,8 +7557,7 @@ BUILDIN_FUNC(killmonsterall)
 		}
 	}
 		
-	map_foreachinmap(buildin_killmonsterall_sub_strip,
-		m,BL_MOB);
+	map_foreachinmap(buildin_killmonsterall_sub_strip,m,BL_MOB);
 	return 0;
 }
 
@@ -11794,10 +11792,10 @@ BUILDIN_FUNC(setnpcdisplay)
 	name = script_getstr(st,2);
 	data = script_getdata(st,3);
 
-	if( script_hasdata(st,5) )
-		size = script_getnum(st,5);
 	if( script_hasdata(st,4) )
 		class_ = script_getnum(st,4);
+	if( script_hasdata(st,5) )
+		size = script_getnum(st,5);
 
 	get_val(st, data);
 	if( data_isstring(data) )

src/map/skill.c

@@ -1473,9 +1473,8 @@ int skill_attack (int attack_type, struct block_list* src, struct block_list *ds
 
 	damage = dmg.damage + dmg.damage2;
 	
-	if (skillid == AL_INCAGI || skillid == AL_BLESSING)
-		if (tsd->sc.data[SC_CHANGEUNDEAD])
-			damage = 1;
+	if( (skillid == AL_INCAGI || skillid == AL_BLESSING) && tsd->sc.data[SC_CHANGEUNDEAD] )
+		damage = 1;
 
 	if (damage > 0 && dmg.flag&BF_WEAPON && src != bl && src == dsrc &&
 		skillid != WS_CARTTERMINATION) // FIXME(?): Quick and dirty check, but HSCR does bypass Shield Reflect... so I make it bypass the whole reflect thing [DracoRPG]
@@ -1764,11 +1763,13 @@ int skill_area_sub (struct block_list *bl, va_list ap)
 
 	if(battle_check_target(src,bl,flag) > 0)
 	{
-		if (flag&(SD_SPLASH|SD_PREAMBLE)) {
-			if (flag&SD_PREAMBLE && !skill_area_temp[2])
-				clif_skill_damage(src,bl,tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, 6);
+		// several splash skills need this initial dummy packet to display correctly
+		if (flag&SD_PREAMBLE && skill_area_temp[2] == 0)
+			clif_skill_damage(src,bl,tick, status_get_amotion(src), 0, -30000, 1, skill_id, skill_lv, 6);
+
+		if (flag&(SD_SPLASH|SD_PREAMBLE))
 			skill_area_temp[2]++;
-		}
+
 		return func(src,bl,skill_id,skill_lv,tick,flag);
 	}
 	return 0;