Merge branch 'master' of https://github.com/rathena/rathena

doc/script_commands.txt

@@ -5605,6 +5605,8 @@ everything not equippable by the new job class anyway.
 These commands will make a character sit or stand.
 If no character is specified, the command will run for the invoking character.
 
+Additionnally Sitting constant is true when the character is sitting, false otherwise.
+
 ---------------------------------------
 
 *disguise <Monster ID>{,<char_id>};

npc/re/instances/SaraMemory.txt

@@ -1166,7 +1166,8 @@ OnMyMobDead:
 	if ('Sara_Mobs < 1) {
 		set 'Sara_Mobs,0;
 		mapannounce instance_mapname("1@sara"), "Sara ran away again! You think she went in the 2 O'clock direction!",bc_map,"0xffff00";
-		viewpoint 1,208,250,1,0x00FF00;
+		if (playerattached() > 0)
+			viewpoint 1,208,250,1,0x00FF00;
 		donpcevent instance_npcname("#sara_warp02", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("#MobsSara02", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("#MobsSara01", instance_id())+"::OnDisable";
@@ -1211,7 +1212,8 @@ OnMyMobDead:
 	if ('Sara_Mobs < 1) {
 		set 'Sara_Mobs,0;
 		mapannounce instance_mapname("1@sara"), "Sara ran away yet again! You think she went in the 5 O'clock direction!",bc_map,"0xffff00";
-		viewpoint 1,226,190,1,0x00FF00;
+		if (playerattached() > 0)
+			viewpoint 1,226,190,1,0x00FF00;
 		donpcevent instance_npcname("#sara_warp03", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("#MobsSara03", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("#MobsSara02", instance_id())+"::OnDisable";
@@ -1288,7 +1290,8 @@ OnMyMobDead:
 	if ('Sara_Mobs < 1) {
 		set 'Sara_Mobs,0;
 		mapannounce instance_mapname("1@sara"), "Sara ran away yet again! *sigh* You think she went in the 12 O'clock direction!",bc_map,"0xffff00";
-		viewpoint 1,166,67,1,0x00FF00;
+		if (playerattached() > 0)
+			viewpoint 1,166,67,1,0x00FF00;
 		donpcevent instance_npcname("#sara_warp04", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("#MobsSara04", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("#MobsSara03", instance_id())+"::OnDisable";
@@ -1364,7 +1367,8 @@ OnMyMobDead:
 	if ('Sara_Mobs < 1) {
 		set 'Sara_Mobs,0;
 		mapannounce instance_mapname("1@sara"), "Sara continues to run away! You think she went in the 12 O'clock direction!",bc_map,"0xffff00";
-		viewpoint 1,155,180,1,0x00FF00;
+		if (playerattached() > 0)
+			viewpoint 1,155,180,1,0x00FF00;
 		donpcevent instance_npcname("#sara_warp05", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("Sara Irene#02", instance_id())+"::OnEnable";
 		donpcevent instance_npcname("Doyen Irene#03", instance_id())+"::OnEnable";

src/map/battle.c

@@ -2007,8 +2007,8 @@ static int battle_range_type(struct block_list *src, struct block_list *target,
 	if( skill_get_inf2( skill_id ) & INF2_TRAP )
 		return BF_SHORT;
 
-	// When monsters use Arrow Shower, it is always short range
-	if (src->type == BL_MOB && skill_id == AC_SHOWER)
+	// When monsters use Arrow Shower or Bomb, it is always short range
+	if (src->type == BL_MOB && (skill_id == AC_SHOWER || skill_id == AM_DEMONSTRATION))
 		return BF_SHORT;
 
 	//Skill Range Criteria