From a6b252c01e0ab5418d5a1f26482b1a1bb02d2de8 Mon Sep 17 00:00:00 2001 From: Atemo Date: Tue, 4 Apr 2017 19:20:26 +0200 Subject: [PATCH 1/2] Added rid check in SaraMemory.txt (issue #2032) --- doc/script_commands.txt | 2 ++ npc/re/instances/SaraMemory.txt | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/script_commands.txt b/doc/script_commands.txt index c6661800ad..1f526ed40a 100644 --- a/doc/script_commands.txt +++ b/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 {,}; diff --git a/npc/re/instances/SaraMemory.txt b/npc/re/instances/SaraMemory.txt index d739073214..0ec2083818 100644 --- a/npc/re/instances/SaraMemory.txt +++ b/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"; From 0a35e3a976cc18eb5c180b9bd9f4775870cb18d8 Mon Sep 17 00:00:00 2001 From: Playtester Date: Wed, 5 Apr 2017 17:37:50 +0200 Subject: [PATCH 2/2] Bomb used by monsters (fixes #2041) * When Bomb used by monsters deals damage, it is now always considered melee damage --- src/map/battle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/battle.c b/src/map/battle.c index c036375f42..8347614df1 100644 --- a/src/map/battle.c +++ b/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