summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-13 07:40:47 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-13 07:40:47 +0000
commit86b6dd2abc6d3925bc44c57d736467f4dfddb915 (patch)
tree4f78ddbce1114653b89a70c24bf2139cf94cba14 /src
parent67e3c09a2ba7833f017ac46d68de3dcae5429afd (diff)
downloadhercules-86b6dd2abc6d3925bc44c57d736467f4dfddb915.tar.gz
hercules-86b6dd2abc6d3925bc44c57d736467f4dfddb915.tar.bz2
hercules-86b6dd2abc6d3925bc44c57d736467f4dfddb915.tar.xz
hercules-86b6dd2abc6d3925bc44c57d736467f4dfddb915.zip
* Added PvP/GvG check for Tiger Knuckle fist
* Fixed Pressure reducing the target's SP twice * Fixed SQL logging not checking if its supposed to use SQL or TXT logs git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1229 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/map.c5
-rw-r--r--src/map/skill.c13
2 files changed, 13 insertions, 5 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 223e82372..7c8275cf9 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3402,9 +3402,8 @@ int do_init(int argc, char *argv[]) {
if(battle_config.mail_system)
do_init_mail();
- if (log_config.branch || log_config.drop || log_config.mvpdrop ||
- log_config.present || log_config.produce || log_config.refine ||
- log_config.trade)
+ if (log_config.sql_logs && (log_config.branch || log_config.drop || log_config.mvpdrop ||
+ log_config.present || log_config.produce || log_config.refine || log_config.trade))
{
log_sql_init();
}
diff --git a/src/map/skill.c b/src/map/skill.c
index 9f7a56551..05c7bc89c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2194,7 +2194,7 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s
sp = tsd->status.max_sp * 10 * skilllv / 100;
if (sp > tsd->status.sp) sp = tsd->status.sp;
tsd->status.sp -= sp;
- pc_heal(tsd,0,-sp);
+ clif_updatestatus(tsd,SP_SP);
}
break;
case NPC_DARKBREATH:
@@ -2269,11 +2269,20 @@ int skill_castend_damage_id( struct block_list* src, struct block_list *bl,int s
}
break;
case MO_COMBOFINISH: /* җ */
- case CH_TIGERFIST: /* Ռ */
case CH_CHAINCRUSH: /* A? */
case CH_PALMSTRIKE: /* ҌՍdhR */
skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
break;
+
+ case CH_TIGERFIST: /* Ռ */
+ if (bl->type == BL_PC && !(map[bl->m].flag.gvg || map[bl->m].flag.pvp)) {
+ map_freeblock_unlock();
+ return 1;
+ }
+ skill_attack(BF_WEAPON,src,src,bl,skillid,skilllv,tick,flag);
+ break;
+
+
case MO_EXTREMITYFIST: /* CeP */
{
struct status_change *sc_data = status_get_sc_data(src);