summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-21 11:34:35 -0300
committershennetsind <ind@henn.et>2013-07-21 11:34:35 -0300
commite3fd7cc88828865aa94ad00a2e2301a1d44e0831 (patch)
tree571b7abc97e0740f324cdf1cbab532a18084b05f /src/map
parenta76709480b8300c7af955f5c2c85d2039c1ee919 (diff)
parent760faf643731de9d38623dce4d129375801f8b33 (diff)
downloadhercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.gz
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.bz2
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.tar.xz
hercules-e3fd7cc88828865aa94ad00a2e2301a1d44e0831.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map')
-rw-r--r--src/map/battle.c2
-rw-r--r--src/map/npc.h2
-rw-r--r--src/map/status.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/src/map/battle.c b/src/map/battle.c
index bded771e7..2fca9ef9c 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -1133,7 +1133,7 @@ int battle_calc_cardfix(int attack_type, struct block_list *src, struct block_li
if( wflag&BF_SHORT )
cardfix = cardfix * (100 - tsd->bonus.near_attack_def_rate) / 100;
else // BF_LONG (there's no other choice)
- cardfix = cardfix * (100 - tsd->bonus.near_attack_def_rate) / 100;
+ cardfix = cardfix * (100 - tsd->bonus.long_attack_def_rate) / 100;
if( tsd->sc.data[SC_PROTECT_DEF] )
cardfix = cardfix * (100 - tsd->sc.data[SC_PROTECT_DEF]->val1) / 100;
diff --git a/src/map/npc.h b/src/map/npc.h
index 16e6fe74c..48c27b297 100644
--- a/src/map/npc.h
+++ b/src/map/npc.h
@@ -99,7 +99,7 @@ enum actor_classes
//Checks if a given id is a valid npc id. [Skotlex]
//Since new npcs are added all the time, the max valid value is the one before the first mob (Scorpion = 1001)
-#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS || ( (id) > 10000 && (id) < 10049 ) )
+#define npcdb_checkid(id) ( ( (id) >= 46 && (id) <= 125) || (id) == HIDDEN_WARP_CLASS || ( (id) > 400 && (id) < MAX_NPC_CLASS ) || (id) == INVISIBLE_CLASS || ( (id) > MAX_NPC_CLASS2_START && (id) < MAX_NPC_CLASS2_END ) )
#ifdef PCRE_SUPPORT
void npc_chat_finalize(struct npc_data* nd);
diff --git a/src/map/status.c b/src/map/status.c
index 0d8bedc5e..58e844529 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6940,6 +6940,14 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
case SC_ELECTRICSHOCKER:
case SC_MAGNETICFIELD:
+ // Masquerades
+ case SC__ENERVATION:
+ case SC__GROOMY:
+ case SC__LAZINESS:
+ case SC__UNLUCKY:
+ case SC__WEAKNESS:
+ case SC__IGNORANCE:
+
return 0;
}
}