Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added new mapflag hidemobhpbar (#1537)

Browse Source 
* Added new mapflag `hidemobhpbar` to hides monster's HP bar on a map.
* Added maps for this mapflag, credits to @Atemo and @Lemongrass3110 

Signed-off-by: Cydh Ramdh <cydh@pservero.com>
This commit is contained in:
Cydh Ramdh 2016-12-04 10:52:14 +07:00 committed by GitHub
parent 222ee49802
commit 342443bf61
18 changed files with 237 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/mapflags.txt
View File

@ -419,3 +419,10 @@ If a player logs out on a nocostume map the costume sprites will also not be sho
character server.
---------------------------------------
*hidemobhpbar
Hides monster's HP bar on a map.
Ignores config value of 'monster_hp_bars_info'.
---------------------------------------

1
npc/custom/battleground/bg_emp.txt
View File

@ -146,3 +146,4 @@ bat_a01 mapflag nomemo
bat_a01 mapflag nopenalty
bat_a01 mapflag nobranch
bat_a01 mapflag noicewall
bat_a01 mapflag hidemobhpbar

1
npc/custom/battleground/bg_pvp.txt
View File

@ -125,3 +125,4 @@ guild_vs3 mapflag nomemo
guild_vs3 mapflag nopenalty
guild_vs3 mapflag nobranch
guild_vs3 mapflag noicewall
guild_vs3 mapflag hidemobhpbar

1
npc/custom/etc/penal_servitude.txt
View File

@ -181,6 +181,7 @@ sec_in02 mapflag noskill
//sec_in02 mapflag pvp_noparty
//sec_in02 mapflag gvg
sec_in02 mapflag pvp_nightmaredrop random,all,300
sec_in02 mapflag hidemobhpbar
sec_in02,138,55,100,100 monster Toadstool 1182,30,10000,10000,1
sec_in02,138,55,100,100 monster Fabre 1184,10,20000,20000

154
npc/mapflag/hidemobhpbar.txt Normal file
View File

@ -0,0 +1,154 @@
//===== rAthena Script =======================================
//= Mapflag: hidemobhpbar.
//===== Description: =========================================
//= Hide monster's HP bar (added in episode 14.2).
//===== Changelogs: ==========================================
//= 1.0 First Version. [Lemongrass]
//============================================================
// PvP ========================
pvp_y_1-1 mapflag hidemobhpbar
pvp_y_1-2 mapflag hidemobhpbar
pvp_y_1-3 mapflag hidemobhpbar
pvp_y_1-4 mapflag hidemobhpbar
pvp_y_1-5 mapflag hidemobhpbar
pvp_y_2-1 mapflag hidemobhpbar
pvp_y_2-2 mapflag hidemobhpbar
pvp_y_2-3 mapflag hidemobhpbar
pvp_y_2-4 mapflag hidemobhpbar
pvp_y_2-5 mapflag hidemobhpbar
pvp_y_3-1 mapflag hidemobhpbar
pvp_y_3-2 mapflag hidemobhpbar
pvp_y_3-3 mapflag hidemobhpbar
pvp_y_3-4 mapflag hidemobhpbar
pvp_y_3-5 mapflag hidemobhpbar
pvp_y_4-1 mapflag hidemobhpbar
pvp_y_4-2 mapflag hidemobhpbar
pvp_y_4-3 mapflag hidemobhpbar
pvp_y_4-4 mapflag hidemobhpbar
pvp_y_4-5 mapflag hidemobhpbar
pvp_y_5-1 mapflag hidemobhpbar
pvp_y_5-2 mapflag hidemobhpbar
pvp_y_5-3 mapflag hidemobhpbar
pvp_y_5-4 mapflag hidemobhpbar
pvp_y_5-5 mapflag hidemobhpbar
pvp_y_6-1 mapflag hidemobhpbar
pvp_y_6-2 mapflag hidemobhpbar
pvp_y_6-3 mapflag hidemobhpbar
pvp_y_6-4 mapflag hidemobhpbar
pvp_y_6-5 mapflag hidemobhpbar
pvp_y_7-1 mapflag hidemobhpbar
pvp_y_7-2 mapflag hidemobhpbar
pvp_y_7-3 mapflag hidemobhpbar
pvp_y_7-4 mapflag hidemobhpbar
pvp_y_7-5 mapflag hidemobhpbar
pvp_y_8-1 mapflag hidemobhpbar
pvp_y_8-2 mapflag hidemobhpbar
pvp_y_8-3 mapflag hidemobhpbar
pvp_y_8-4 mapflag hidemobhpbar
pvp_y_8-5 mapflag hidemobhpbar
pvp_n_1-1 mapflag hidemobhpbar
pvp_n_1-2 mapflag hidemobhpbar
pvp_n_1-3 mapflag hidemobhpbar
pvp_n_1-4 mapflag hidemobhpbar
pvp_n_1-5 mapflag hidemobhpbar
pvp_n_2-1 mapflag hidemobhpbar
pvp_n_2-2 mapflag hidemobhpbar
pvp_n_2-3 mapflag hidemobhpbar
pvp_n_2-4 mapflag hidemobhpbar
pvp_n_2-5 mapflag hidemobhpbar
pvp_n_3-1 mapflag hidemobhpbar
pvp_n_3-2 mapflag hidemobhpbar
pvp_n_3-3 mapflag hidemobhpbar
pvp_n_3-4 mapflag hidemobhpbar
pvp_n_3-5 mapflag hidemobhpbar
pvp_n_4-1 mapflag hidemobhpbar
pvp_n_4-2 mapflag hidemobhpbar
pvp_n_4-3 mapflag hidemobhpbar
pvp_n_4-4 mapflag hidemobhpbar
pvp_n_4-5 mapflag hidemobhpbar
pvp_n_5-1 mapflag hidemobhpbar
pvp_n_5-2 mapflag hidemobhpbar
pvp_n_5-3 mapflag hidemobhpbar
pvp_n_5-4 mapflag hidemobhpbar
pvp_n_5-5 mapflag hidemobhpbar
pvp_n_6-1 mapflag hidemobhpbar
pvp_n_6-2 mapflag hidemobhpbar
pvp_n_6-3 mapflag hidemobhpbar
pvp_n_6-4 mapflag hidemobhpbar
pvp_n_6-5 mapflag hidemobhpbar
pvp_n_7-1 mapflag hidemobhpbar
pvp_n_7-2 mapflag hidemobhpbar
pvp_n_7-3 mapflag hidemobhpbar
pvp_n_7-4 mapflag hidemobhpbar
pvp_n_7-5 mapflag hidemobhpbar
pvp_n_8-1 mapflag hidemobhpbar
pvp_n_8-2 mapflag hidemobhpbar
pvp_n_8-3 mapflag hidemobhpbar
pvp_n_8-4 mapflag hidemobhpbar
pvp_n_8-5 mapflag hidemobhpbar
pvp_2vs2 mapflag hidemobhpbar
// Aldebaran Turbo Track =======
turbo_e_4 mapflag hidemobhpbar
turbo_e_8 mapflag hidemobhpbar
turbo_e_16 mapflag hidemobhpbar
// GvG Arenas =================
guild_vs1 mapflag hidemobhpbar
guild_vs2 mapflag hidemobhpbar
guild_vs3 mapflag hidemobhpbar
guild_vs4 mapflag hidemobhpbar
guild_vs5 mapflag hidemobhpbar
// Guild Castles ==============
aldeg_cas01 mapflag hidemobhpbar
aldeg_cas02 mapflag hidemobhpbar
aldeg_cas03 mapflag hidemobhpbar
aldeg_cas04 mapflag hidemobhpbar
aldeg_cas05 mapflag hidemobhpbar
gefg_cas01 mapflag hidemobhpbar
gefg_cas02 mapflag hidemobhpbar
gefg_cas03 mapflag hidemobhpbar
gefg_cas04 mapflag hidemobhpbar
gefg_cas05 mapflag hidemobhpbar
payg_cas01 mapflag hidemobhpbar
payg_cas02 mapflag hidemobhpbar
payg_cas03 mapflag hidemobhpbar
payg_cas04 mapflag hidemobhpbar
payg_cas05 mapflag hidemobhpbar
prtg_cas01 mapflag hidemobhpbar
prtg_cas02 mapflag hidemobhpbar
prtg_cas03 mapflag hidemobhpbar
prtg_cas04 mapflag hidemobhpbar
prtg_cas05 mapflag hidemobhpbar
schg_cas01 mapflag hidemobhpbar
schg_cas02 mapflag hidemobhpbar
schg_cas03 mapflag hidemobhpbar
schg_cas04 mapflag hidemobhpbar
schg_cas05 mapflag hidemobhpbar
arug_cas01 mapflag hidemobhpbar
arug_cas02 mapflag hidemobhpbar
arug_cas03 mapflag hidemobhpbar
arug_cas04 mapflag hidemobhpbar
arug_cas05 mapflag hidemobhpbar
// Novice Guild Castles =======
//n_castle mapflag hidemobhpbar
nguild_alde mapflag hidemobhpbar
nguild_gef mapflag hidemobhpbar
nguild_pay mapflag hidemobhpbar
nguild_prt mapflag hidemobhpbar
// Guild Dungeons =============
arug_dun01 mapflag hidemobhpbar
schg_dun01 mapflag hidemobhpbar
// Battlegrounds ==============
bat_c01 mapflag hidemobhpbar
bat_c02 mapflag hidemobhpbar
bat_c03 mapflag hidemobhpbar
bat_b01 mapflag hidemobhpbar
bat_b02 mapflag hidemobhpbar
bat_a01 mapflag hidemobhpbar
bat_a02 mapflag hidemobhpbar

6
npc/mapflag/jail.txt
View File

@ -15,6 +15,7 @@
//= nosave: No saving respawn point allowed. Use SavePoint to use the
//= players previous savepoint, or choose one manually.
//= noteleport: No Teleporting allowed. No fly wings or butterfly wings.
//= hidemobhpbar: No HP bar will be displayed for monsters.
//===== Additional Comments: =================================
//= 1.0 Initial script.
//============================================================
@ -40,5 +41,8 @@ sec_pri mapflag pvp
// No Party ==============================
sec_pri mapflag pvp_noparty
//Nightmare Equipment Drops PVP ==========
// Nightmare Equipment Drops PVP =========
sec_pri mapflag pvp_nightmaredrop random,equip,300
// Hide Monster HP bar ===================
sec_pri mapflag hidemobhpbar

13
npc/pre-re/mapflag/hidemobhpbar.txt Normal file
View File

@ -0,0 +1,13 @@
//===== rAthena Script =======================================
//= Mapflag: hidemobhpbar.
//===== Description: =========================================
//= Hide monster's HP bar (added in episode 14.2).
//===== Changelogs: ==========================================
//= 1.0 First Version. [Lemongrass]
//============================================================
// Guild Dungeons =============
gld_dun01 mapflag hidemobhpbar
gld_dun02 mapflag hidemobhpbar
gld_dun03 mapflag hidemobhpbar
gld_dun04 mapflag hidemobhpbar

1
npc/pre-re/scripts_mapflags.conf
View File

@ -1,4 +1,5 @@
// --------------------------------------------------------------
// - Pre-Renewal Map Flags -
// --------------------------------------------------------------
npc: npc/pre-re/mapflag/hidemobhpbar.txt
npc: npc/pre-re/mapflag/gvg.txt

34
npc/re/mapflag/hidemobhpbar.txt Normal file
View File

@ -0,0 +1,34 @@
//===== rAthena Script =======================================
//= Mapflag: hidemobhpbar.
//===== Description: =========================================
//= Hide monster's HP bar (added in episode 14.2).
//===== Changelogs: ==========================================
//= 1.0 First Version. [Capuche]
//============================================================
// Izlude Academy
iz_ac01 mapflag hidemobhpbar
iz_ac01_a mapflag hidemobhpbar
iz_ac01_b mapflag hidemobhpbar
iz_ac01_c mapflag hidemobhpbar
iz_ac01_d mapflag hidemobhpbar
// WoE TE castle
te_prtcas01 mapflag hidemobhpbar
te_prtcas02 mapflag hidemobhpbar
te_prtcas03 mapflag hidemobhpbar
te_prtcas04 mapflag hidemobhpbar
te_prtcas05 mapflag hidemobhpbar
te_aldecas1 mapflag hidemobhpbar
te_aldecas2 mapflag hidemobhpbar
te_aldecas3 mapflag hidemobhpbar
te_aldecas4 mapflag hidemobhpbar
te_aldecas5 mapflag hidemobhpbar
// Guild Dungeons =========
gld2_ald mapflag hidemobhpbar
gld2_gef mapflag hidemobhpbar
gld2_pay mapflag hidemobhpbar
gld2_prt mapflag hidemobhpbar
teg_dun01 mapflag hidemobhpbar
teg_dun02 mapflag hidemobhpbar

1
npc/re/scripts_mapflags.conf
View File

@ -3,6 +3,7 @@
// --------------------------------------------------------------
npc: npc/re/mapflag/nopvp.txt
npc: npc/re/mapflag/gvg.txt
npc: npc/re/mapflag/hidemobhpbar.txt
npc: npc/re/mapflag/nobranch.txt
npc: npc/re/mapflag/noicewall.txt
npc: npc/re/mapflag/nomemo.txt

1
npc/scripts_mapflags.conf
View File

@ -3,6 +3,7 @@
// --------------------------------------------------------------
npc: npc/mapflag/nopvp.txt
npc: npc/mapflag/gvg.txt
npc: npc/mapflag/hidemobhpbar.txt
npc: npc/mapflag/jail.txt
npc: npc/mapflag/nightmare.txt
npc: npc/mapflag/nobranch.txt

8
src/map/atcommand.c
View File

@ -4182,6 +4182,8 @@ ACMD_FUNC(mapinfo) {
strcat(atcmd_output, " AllowKS |");
if (map[m_id].flag.reset)
strcat(atcmd_output, " Reset |");
if (map[m_id].flag.hidemobhpbar)
strcat(atcmd_output, " HideMobHPBar |");
clif_displaymessage(fd, atcmd_output);
strcpy(atcmd_output,msg_txt(sd,1051)); // Other Flags2:
@ -8094,7 +8096,7 @@ ACMD_FUNC(mapflag) {
checkflag(partylock); checkflag(guildlock); checkflag(reset); checkflag(chmautojoin);
checkflag(nousecart); checkflag(noitemconsumption); checkflag(nosumstarmiracle); checkflag(nomineeffect);
checkflag(nolockon); checkflag(notomb); checkflag(nocostume); checkflag(gvg_te);
checkflag(gvg_te_castle);
checkflag(gvg_te_castle); checkflag(hidemobhpbar);
#ifdef ADJUST_SKILL_DAMAGE
checkflag(skill_damage);
#endif
@ -8119,7 +8121,7 @@ ACMD_FUNC(mapflag) {
setflag(partylock); setflag(guildlock); setflag(reset); setflag(chmautojoin);
setflag(nousecart); setflag(noitemconsumption); setflag(nosumstarmiracle); setflag(nomineeffect);
setflag(nolockon); setflag(notomb); setflag(nocostume); setflag(gvg_te);
setflag(gvg_te_castle);
setflag(gvg_te_castle); setflag(hidemobhpbar);
#ifdef ADJUST_SKILL_DAMAGE
setflag(skill_damage);
#endif
@ -8135,7 +8137,7 @@ ACMD_FUNC(mapflag) {
clif_displaymessage(sd->fd,"fog, fireworks, sakura, leaves, nogo, nobaseexp, nojobexp, nomobloot, nomvploot,");
clif_displaymessage(sd->fd,"nightenabled, restricted, nodrop, novending, loadevent, nochat, partylock, guildlock,");
clif_displaymessage(sd->fd,"reset, chmautojoin, nousecart, noitemconsumption, nosumstarmiracle, nolockon, notomb,");
clif_displaymessage(sd->fd,"nocostume, gvg_te, gvg_te_castle");
clif_displaymessage(sd->fd,"nocostume, gvg_te, gvg_te_castle, hidemobhpbar");
#ifdef ADJUST_SKILL_DAMAGE
clif_displaymessage(sd->fd,"skill_damage");
#endif

6
src/map/clif.c
View File

@ -1130,7 +1130,7 @@ static int clif_set_unit_idle(struct block_list* bl, unsigned char* buffer, bool
WBUFW(buf,53) = (sd ? sd->status.font : 0);
#endif
#if PACKETVER >= 20120221
if ( battle_config.monster_hp_bars_info && bl->type == BL_MOB && (status_get_hp(bl) < status_get_max_hp(bl)) ) {
if ( battle_config.monster_hp_bars_info && !map[bl->m].flag.hidemobhpbar && bl->type == BL_MOB && (status_get_hp(bl) < status_get_max_hp(bl)) ) {
WBUFL(buf,55) = status_get_max_hp(bl); // maxHP
WBUFL(buf,59) = status_get_hp(bl); // HP
} else {
@ -1273,7 +1273,7 @@ static int clif_set_unit_walking(struct block_list* bl, struct unit_data* ud, un
WBUFW(buf,60) = (sd ? sd->status.font : 0);
#endif
#if PACKETVER >= 20120221
if ( battle_config.monster_hp_bars_info && bl->type == BL_MOB && (status_get_hp(bl) < status_get_max_hp(bl)) ) {
if ( battle_config.monster_hp_bars_info && !map[bl->m].flag.hidemobhpbar && bl->type == BL_MOB && (status_get_hp(bl) < status_get_max_hp(bl)) ) {
WBUFL(buf,62) = status_get_max_hp(bl); // maxHP
WBUFL(buf,66) = status_get_hp(bl); // HP
} else {
@ -4612,7 +4612,7 @@ void clif_getareachar_unit(struct map_session_data* sd,struct block_list *bl)
else if(md->special_state.size==SZ_MEDIUM)
clif_specialeffect_single(bl,421,sd->fd);
#if PACKETVER >= 20120404
if( battle_config.monster_hp_bars_info){
if (battle_config.monster_hp_bars_info && !map[bl->m].flag.hidemobhpbar) {
int i;
for(i = 0; i < DAMAGELOG_SIZE; i++)// must show hp bar to all char who already hit the mob.
if( md->dmglog[i].id == sd->status.char_id )

1
src/map/map.h
View File

@ -672,6 +672,7 @@ struct map_data {
unsigned nocostume : 1; // Disable costume sprites [Cydh]
unsigned gvg_te : 1; // GVG WOE:TE. This was added as purpose to change 'gvg' for GVG TE, so item_noequp, skill_nocast exlude GVG TE maps from 'gvg' (flag &4)
unsigned gvg_te_castle : 1; // GVG WOE:TE Castle
unsigned hidemobhpbar : 1;
#ifdef ADJUST_SKILL_DAMAGE
unsigned skill_damage : 1;
#endif

4
src/map/mob.c
View File

@ -2249,7 +2249,7 @@ void mob_damage(struct mob_data *md, struct block_list *src, int damage)
clif_name_area(&md->bl);
#if PACKETVER >= 20120404
if( battle_config.monster_hp_bars_info){
if (battle_config.monster_hp_bars_info && !map[md->bl.m].flag.hidemobhpbar) {
int i;
for(i = 0; i < DAMAGELOG_SIZE; i++){ // must show hp bar to all char who already hit the mob.
struct map_session_data *sd = map_charid2sd(md->dmglog[i].id);
@ -3059,7 +3059,7 @@ void mob_heal(struct mob_data *md,unsigned int heal)
if (battle_config.show_mob_info&3)
clif_name_area(&md->bl);
#if PACKETVER >= 20120404
if( battle_config.monster_hp_bars_info){
if (battle_config.monster_hp_bars_info && !map[md->bl.m].flag.hidemobhpbar) {
int i;
for(i = 0; i < DAMAGELOG_SIZE; i++)// must show hp bar to all char who already hit the mob.
if( md->dmglog[i].id ) {

2
src/map/npc.c
View File

@ -4131,6 +4131,8 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con
map[m].flag.notomb = state;
else if (!strcmpi(w3,"nocostume"))
map[m].flag.nocostume = state;
else if (!strcmpi(w3,"hidemobhpbar"))
map[m].flag.hidemobhpbar = state;
else if (!strcmpi(w3,"skill_damage")) {
#ifdef ADJUST_SKILL_DAMAGE
char skill[SKILL_NAME_LENGTH];

4
src/map/script.c
View File

@ -364,6 +364,7 @@ enum {
MF_NOCOSTUME,
MF_GVG_TE_CASTLE,
MF_GVG_TE,
MF_HIDEMOBHPBAR,
};
const char* script_op2name(int op)
@ -11891,6 +11892,7 @@ BUILDIN_FUNC(getmapflag)
case MF_NOCOSTUME: script_pushint(st,map[m].flag.nocostume); break;
case MF_GVG_TE_CASTLE: script_pushint(st,map[m].flag.gvg_te_castle); break;
case MF_GVG_TE: script_pushint(st,map[m].flag.gvg_te); break;
case MF_HIDEMOBHPBAR: script_pushint(st,map[m].flag.hidemobhpbar); break;
#ifdef ADJUST_SKILL_DAMAGE
case MF_SKILL_DAMAGE:
{
@ -12014,6 +12016,7 @@ BUILDIN_FUNC(setmapflag)
map[m].flag.gvg_te = 1;
clif_map_property_mapall(m, MAPPROPERTY_AGITZONE);
break;
case MF_HIDEMOBHPBAR: map[m].flag.hidemobhpbar = 1; break;
#ifdef ADJUST_SKILL_DAMAGE
case MF_SKILL_DAMAGE:
{
@ -12121,6 +12124,7 @@ BUILDIN_FUNC(removemapflag)
map[m].flag.gvg_te = 0;
clif_map_property_mapall(m, MAPPROPERTY_NOTHING);
break;
case MF_HIDEMOBHPBAR: map[m].flag.hidemobhpbar = 0; break;
#ifdef ADJUST_SKILL_DAMAGE
case MF_SKILL_DAMAGE:
{

1
src/map/script_constants.h
View File

@ -412,6 +412,7 @@
export_constant(MF_NOCOSTUME);
export_constant(MF_GVG_TE_CASTLE);
export_constant(MF_GVG_TE);
export_constant(MF_HIDEMOBHPBAR);
/* setcell types */
export_constant(CELL_WALKABLE);