diff options
| author | Wushin <pasekei@gmail.com> | 2014-11-04 08:58:26 -0600 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2014-11-04 08:58:26 -0600 |
| commit | faa2151d3e775bfa02b7ebac5c946140ceb30c52 (patch) | |
| tree | 2e2aa685184e33f61f9ea4319fff82246d1dfa7e /world/map/conf/magic-procedures.sex | |
| parent | 474b798565cb2d6dd4f471d769a865cd0981b285 (diff) | |
| parent | e8236326e16fb7e94104b69e584f55fd13ce2fe5 (diff) | |
| download | serverdata-faa2151d3e775bfa02b7ebac5c946140ceb30c52.tar.gz serverdata-faa2151d3e775bfa02b7ebac5c946140ceb30c52.tar.bz2 serverdata-faa2151d3e775bfa02b7ebac5c946140ceb30c52.tar.xz serverdata-faa2151d3e775bfa02b7ebac5c946140ceb30c52.zip | |
Merge pull request #201 from mekolat/lum-fixv2014.11.4.1
fix lum
Diffstat (limited to 'world/map/conf/magic-procedures.sex')
| -rw-r--r-- | world/map/conf/magic-procedures.sex | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/world/map/conf/magic-procedures.sex b/world/map/conf/magic-procedures.sex index bce579fc..e9ec7aae 100644 --- a/world/map/conf/magic-procedures.sex +++ b/world/map/conf/magic-procedures.sex @@ -280,7 +280,7 @@ (PROCEDURE install_melee_spell (charges base_delay attack_animation) (CALL install_attack_spell charges base_delay 1 attack_animation)) -(PROCEDURE fightclub_check () +(PROCEDURE fightclub_check (healing) (IF (&& (is_in (location caster) (@+ @@ -290,7 +290,17 @@ (|| (== (script_int caster "$@Duel_NoMagic") 1) (!= (script_int caster "@Duel_Fighter") 1))) - (ABORT))) + (ABORT)) + (IF (== healing 1) + (IF (&& + (== (substr (location caster) 2 5) "009-7") + (not + (is_in (location caster) + (@+ + (@ "009-7.gat" (script_int caster "$@fightclub_x1") (script_int caster "$@fightclub_y1")) + (- (script_int caster "$@fightclub_x2") (script_int caster "$@fightclub_x1")) + (- (script_int caster "$@fightclub_y2") (script_int caster "$@fightclub_y1")))))) + (ABORT)))) (PROCEDURE summon_spell (mob_id count delay lifetime control_level school) (CALL default_effect) |