From b6f1b6b9a11bdb8a5001dbc042d54fce0a963705 Mon Sep 17 00:00:00 2001 From: zephyrus Date: Thu, 8 May 2008 16:58:57 +0000 Subject: - Added some new items and headgears. - Changed the way DEF Potion and MDEF potion works to official. - Cleanups to Barricade Engine. It now can be used in WoE 2.0, i will release optional scripts soon. - Fixes to @noks. Now if the mob is targeting someone else the protection get lost. - Added new status effects icons to cash items. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12693 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/map/map.h') diff --git a/src/map/map.h b/src/map/map.h index 46cd966e0..c32951b45 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -44,8 +44,6 @@ struct item_data; #define MAX_IGNORE_LIST 20 // official is 14 #define MAX_VENDING 12 #define MOBID_EMPERIUM 1288 -#define MOBID_BARRICADEB 1905 -#define MOBID_BARRICADEA 1906 // Undestruble //The following system marks a different job ID system used by the map server, //which makes a lot more sense than the normal one. [Skotlex] @@ -163,6 +161,8 @@ enum { #define map_flag_gvg(m) (map[m].flag.gvg || (agit_flag && map[m].flag.gvg_castle)) //Specifies if the map is tagged as GvG/WoE (regardless of agit_flag status) #define map_flag_gvg2(m) (map[m].flag.gvg || map[m].flag.gvg_castle) +// No Kill Steal Protection +#define map_flag_ks(m) (map[m].flag.town || map[m].flag.pvp || map[m].flag.gvg) //This stackable implementation does not means a BL can be more than one type at a time, but it's //meant to make it easier to check for multiple types at a time on invocations such as map_foreach* calls [Skotlex] @@ -389,7 +389,8 @@ struct mapcell struct barricade_data { char npc_event[50]; short m, x, y, count, amount, dir; - bool killable; + + bool killable, shootable, walkable; }; struct map_data { -- cgit v1.2.3-60-g2f50