Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release mapflag gvg_noally #13

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Release mapflag gvg_noally #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad44690
init
cydh Oct 11, 2018
39b451c
Merge branch 'master' into mapflag/gvg_noally
cydh Jun 12, 2019
2041db9
Merge branch 'master' into mapflag/gvg_noally
cydh Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/mapflags.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,15 @@ because it does not necessarily require PvP mode to be set.

*gvg
*gvg_noparty
*gvg_noally
*gvg_castle
*gvg_dungeon
*gvg_te
*gvg_te_castle

Enables Guild vs. Guild mode on a map and applies the corresponding damage adjustments.
'gvg_noparty' will ignore party alliances.
'gvg_noally' will ignore guild alliances.
'gvg_castle' marks a guild castle. GvG mode will be active only during the War of Emperium.
'gvg_dungeon' marks a guild dungeon. Players will be warped out after two deaths.
'gvg_te' and 'gvg_te_castle' marks a WOE:TE area and special restrictions are applied.
Expand Down
2 changes: 1 addition & 1 deletion src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7906,7 +7906,7 @@ int battle_check_target( struct block_list *src, struct block_list *target,int f
{
int s_guild = status_get_guild_id(s_bl);
int t_guild = status_get_guild_id(t_bl);
if( !(mapdata->flag[MF_PVP] && mapdata->flag[MF_PVP_NOGUILD]) && s_guild && t_guild && (s_guild == t_guild || (!(flag&BCT_SAMEGUILD) && guild_isallied(s_guild, t_guild))) && (!mapdata->flag[MF_BATTLEGROUND] || sbg_id == tbg_id) )
if( !(mapdata->flag[MF_PVP] && mapdata->flag[MF_PVP_NOGUILD]) && s_guild && t_guild && (s_guild == t_guild || (!(flag&BCT_SAMEGUILD) && !mapdata->flag[MF_GVG_NOALLY] && guild_isallied(s_guild, t_guild))) && (!mapdata->flag[MF_BATTLEGROUND] || sbg_id == tbg_id) )
state |= BCT_GUILD;
else
state |= BCT_ENEMY;
Expand Down
1 change: 1 addition & 0 deletions src/map/map.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@ enum e_mapflag : int16 {
MF_PRIVATEAIRSHIP_SOURCE,
MF_PRIVATEAIRSHIP_DESTINATION,
MF_SKILL_DURATION,
MF_GVG_NOALLY,
MF_MAX
};

Expand Down
1 change: 1 addition & 0 deletions src/map/script_constants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@
export_constant(MF_PRIVATEAIRSHIP_SOURCE);
export_constant(MF_PRIVATEAIRSHIP_DESTINATION);
export_constant(MF_SKILL_DURATION);
export_constant(MF_GVG_NOALLY);

/* setcell types */
export_constant(CELL_WALKABLE);
Expand Down